[tests] Added ant test.ecj19 and updated tests

Tests updated because ecj finally fixed their pretty printer for records, yay!
This commit is contained in:
Reinier Zwitserloot committed 2023-01-12 00:40:03 +01:00
1 parent fd0530f4e9
commit a6f34d0a15
4 files changed
+42 -39

No files matched your search

+2
View File
@@ -29,6 +29,7 @@
<conf name="ecj11" />
<conf name="ecj14" />
<conf name="ecj16" />
<conf name="ecj19" />
<conf name="eclipse-oxygen" />
<conf name="eclipse-202006" />
@@ -77,6 +78,7 @@
<!-- ecjs -->
<dependency org="org.eclipse.jdt" name="ecj" rev="3.32.0" conf="ecj19->master" />
<dependency org="org.eclipse.jdt" name="ecj" rev="3.25.0" conf="ecj16->master" />
<dependency org="org.eclipse.jdt" name="ecj" rev="3.22.0.v20200530-2032" conf="ecj14->master" />
<dependency org="org.eclipse.jdt" name="ecj" rev="3.16.0" conf="ecj11->master" />
+37 -32
View File
@@ -208,6 +208,38 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
<test.eclipse-X version="202006" compiler.compliance.level="8" />
</target>
<macrodef name="test.eclipse-X-full">
<attribute name="version" />
<sequential>
<path id="cp.eclipse-@{version}">
<fileset dir="testenv/eclipse-@{version}/plugins">
<include name="*.jar" />
</fileset>
</path>
<echo>Running EclipseTests on eclipse-@{version} on JVM${ant.java.version}</echo>
<junit haltonfailure="yes" fork="true" forkmode="once">
<formatter classname="lombok.ant.SimpleTestFormatter" usefile="false" unless="tests.quiet" />
<jvmarg value="-javaagent:dist/lombok.jar" />
<jvmarg value="-Dlombok.testenv=testenv/eclipse-@{version}" />
<classpath refid="cp.eclipse-@{version}" />
<classpath location="build/ant" />
<classpath refid="cp.test" />
<classpath refid="cp.eclipse-@{version}" />
<classpath refid="packing.basedirs.path" />
<classpath location="build/tests" />
<test name="lombok.eclipse.EclipseTests" />
</junit>
</sequential>
</macrodef>
<target name="test.eclipse-oxygen-full" depends="test.formatter.compile, test.eclipse.compile, deps.eclipse.oxygen" description="runs the full eclipse tests on your default VM, testing the oxygen release of eclipse">
<test.eclipse-X-full version="oxygen" />
</target>
<target name="test.eclipse-2022-03-full" depends="test.formatter.compile, test.eclipse.compile, deps.eclipse.2022-03" description="runs the full eclipse tests on your default VM, testing the 2022-03 release of eclipse">
<test.eclipse-X-full version="2022-03" />
</target>
<macrodef name="test.ecj-X">
<attribute name="version" />
<sequential>
@@ -234,46 +266,19 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
<test.ecj-X version="11" />
</target>
<target name="test.ecj14" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj11 release">
<target name="test.ecj14" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj14 release">
<fetchdep.ecj version="14" />
<test.ecj-X version="14" />
</target>
<target name="test.ecj16" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj11 release">
<target name="test.ecj16" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj16 release">
<fetchdep.ecj version="16" />
<test.ecj-X version="16" />
</target>
<macrodef name="test.eclipse-X-full">
<attribute name="version" />
<sequential>
<path id="cp.eclipse-@{version}">
<fileset dir="testenv/eclipse-@{version}/plugins">
<include name="*.jar" />
</fileset>
</path>
<echo>Running EclipseTests on eclipse-@{version} on JVM${ant.java.version}</echo>
<junit haltonfailure="yes" fork="true" forkmode="once">
<formatter classname="lombok.ant.SimpleTestFormatter" usefile="false" unless="tests.quiet" />
<jvmarg value="-javaagent:dist/lombok.jar" />
<jvmarg value="-Dlombok.testenv=testenv/eclipse-@{version}" />
<classpath refid="cp.eclipse-@{version}" />
<classpath location="build/ant" />
<classpath refid="cp.test" />
<classpath refid="cp.eclipse-@{version}" />
<classpath refid="packing.basedirs.path" />
<classpath location="build/tests" />
<test name="lombok.eclipse.EclipseTests" />
</junit>
</sequential>
</macrodef>
<target name="test.eclipse-oxygen-full" depends="test.formatter.compile, test.eclipse.compile, deps.eclipse.oxygen" description="runs the full eclipse tests on your default VM, testing the oxygen release of eclipse">
<test.eclipse-X-full version="oxygen" />
</target>
<target name="test.eclipse-2022-03-full" depends="test.formatter.compile, test.eclipse.compile, deps.eclipse.2022-03" description="runs the full eclipse tests on your default VM, testing the 2022-03 release of eclipse">
<test.eclipse-X-full version="2022-03" />
<target name="test.ecj19" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj19 release">
<fetchdep.ecj version="19" />
<test.ecj-X version="19" />
</target>
<target name="test" depends="test.javacCurrent, test.eclipse-202006" description="runs the tests against the default JVM, javac, and eclipse" />
@@ -1,7 +1,7 @@
// version 14:
// version 19:
import lombok.extern.flogger.Flogger;
class LoggerFloggerRecord {
public static @Flogger record Inner(com log) {
public @Flogger record Inner(com log) {
private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass();
/* Implicit */ private final String x;
<clinit>() {
@@ -1,11 +1,7 @@
// version 14:
// version 19:
import lombok.NonNull;
public record NonNullOnRecord3(String a) {
/* Implicit */ private final String a;
public NonNullOnRecord3(String a) {
super();
.a = a;
}
public NonNullOnRecord3(String a) {
super();
this.a = a;