diff options
Diffstat (limited to 'test')
53 files changed, 99 insertions, 69 deletions
diff --git a/test/core/src/lombok/DirectoryRunner.java b/test/core/src/lombok/DirectoryRunner.java index ffadba8f..116b9d94 100644 --- a/test/core/src/lombok/DirectoryRunner.java +++ b/test/core/src/lombok/DirectoryRunner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2019 The Project Lombok Authors. + * Copyright (C) 2009-2020 The Project Lombok Authors. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,20 +24,23 @@ package lombok; import java.io.File; import java.io.FileFilter; import java.io.IOException; +import java.util.Arrays; +import java.util.List; import java.util.Map; import java.util.TreeMap; -import lombok.eclipse.Eclipse; -import lombok.javac.Javac; - import org.junit.runner.Description; import org.junit.runner.Runner; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; +import lombok.eclipse.Eclipse; +import lombok.javac.Javac; + public class DirectoryRunner extends Runner { - /** Fill in a file name (or multiple, space separated) to reduce the testset to just the named file(s). */ - private static final String DEBUG_FOCUS_ON_FILE = ""; + /** Add 1 or more file names to reduce the testset to just the named file(s). No files = test it all. */ + private static final List<String> DEBUG_FOCUS_ON_FILE = Arrays.asList( + ); public enum Compiler { DELOMBOK { @@ -80,7 +83,7 @@ public class DirectoryRunner extends Runner { private static final FileFilter JAVA_FILE_FILTER = new FileFilter() { @Override public boolean accept(File file) { return file.isFile() && file.getName().endsWith(".java") && - (DEBUG_FOCUS_ON_FILE.isEmpty() || (" " + DEBUG_FOCUS_ON_FILE + " ").contains(" " + file.getName() + " ")); + (DEBUG_FOCUS_ON_FILE.isEmpty() || DEBUG_FOCUS_ON_FILE.contains(file.getName())); } }; diff --git a/test/transform/resource/after-delombok/BuilderComplex.java b/test/transform/resource/after-delombok/BuilderComplex.java index a82a0497..009ebe6c 100644 --- a/test/transform/resource/after-delombok/BuilderComplex.java +++ b/test/transform/resource/after-delombok/BuilderComplex.java @@ -37,7 +37,7 @@ class BuilderComplex { } @java.lang.SuppressWarnings("all") public void execute() { - BuilderComplex.<T>testVoidWithGenerics(number, arg2, arg3, selfRef); + BuilderComplex.<T>testVoidWithGenerics(this.number, this.arg2, this.arg3, this.selfRef); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderDefaults.java b/test/transform/resource/after-delombok/BuilderDefaults.java index eb692267..5a563024 100644 --- a/test/transform/resource/after-delombok/BuilderDefaults.java +++ b/test/transform/resource/after-delombok/BuilderDefaults.java @@ -51,10 +51,10 @@ public final class BuilderDefaults { @java.lang.SuppressWarnings("all") public BuilderDefaults build() { int x$value = this.x$value; - if (!x$set) x$value = BuilderDefaults.$default$x(); + if (!this.x$set) x$value = BuilderDefaults.$default$x(); long z$value = this.z$value; - if (!z$set) z$value = BuilderDefaults.$default$z(); - return new BuilderDefaults(x$value, name, z$value); + if (!this.z$set) z$value = BuilderDefaults.$default$z(); + return new BuilderDefaults(x$value, this.name, z$value); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java index fb187e27..71dc7c5f 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsGenerics.java @@ -59,11 +59,11 @@ public class BuilderDefaultsGenerics<N extends Number, T, R extends List<T>> { @java.lang.SuppressWarnings("all") public BuilderDefaultsGenerics<N, T, R> build() { java.util.concurrent.Callable<N> callable$value = this.callable$value; - if (!callable$set) callable$value = BuilderDefaultsGenerics.<N, T, R>$default$callable(); + if (!this.callable$set) callable$value = BuilderDefaultsGenerics.<N, T, R>$default$callable(); T tee$value = this.tee$value; - if (!tee$set) tee$value = BuilderDefaultsGenerics.<N, T, R>$default$tee(); + if (!this.tee$set) tee$value = BuilderDefaultsGenerics.<N, T, R>$default$tee(); R arrr$value = this.arrr$value; - if (!arrr$set) arrr$value = BuilderDefaultsGenerics.<N, T, R>$default$arrr(); + if (!this.arrr$set) arrr$value = BuilderDefaultsGenerics.<N, T, R>$default$arrr(); return new BuilderDefaultsGenerics<N, T, R>(callable$value, tee$value, arrr$value); } @java.lang.Override diff --git a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java index f00d42af..4df98158 100644 --- a/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java +++ b/test/transform/resource/after-delombok/BuilderDefaultsWarnings.java @@ -60,7 +60,7 @@ public class BuilderDefaultsWarnings { default: items = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.items)); } - return new BuilderDefaultsWarnings(x, z, items); + return new BuilderDefaultsWarnings(this.x, this.z, items); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderGenericMethod.java b/test/transform/resource/after-delombok/BuilderGenericMethod.java index 053e8ce4..d57f6415 100644 --- a/test/transform/resource/after-delombok/BuilderGenericMethod.java +++ b/test/transform/resource/after-delombok/BuilderGenericMethod.java @@ -25,7 +25,7 @@ class BuilderGenericMethod<T> { } @java.lang.SuppressWarnings("all") public Map<N, T> build() { - return BuilderGenericMethod.this.<N>foo(a, b); + return BuilderGenericMethod.this.<N>foo(this.a, this.b); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderInstanceMethod.java b/test/transform/resource/after-delombok/BuilderInstanceMethod.java index 9389d871..d0d5833f 100644 --- a/test/transform/resource/after-delombok/BuilderInstanceMethod.java +++ b/test/transform/resource/after-delombok/BuilderInstanceMethod.java @@ -38,7 +38,7 @@ class BuilderInstanceMethod<T> { } @java.lang.SuppressWarnings("all") public String build() { - return BuilderInstanceMethod.this.create(show, yes, also, $andMe); + return BuilderInstanceMethod.this.create(this.show, this.yes, this.also, this.$andMe); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderJavadoc.java b/test/transform/resource/after-delombok/BuilderJavadoc.java index 1e004e1e..e64bed5f 100644 --- a/test/transform/resource/after-delombok/BuilderJavadoc.java +++ b/test/transform/resource/after-delombok/BuilderJavadoc.java @@ -69,7 +69,7 @@ class BuilderJavadoc<T> { } @java.lang.SuppressWarnings("all") public BuilderJavadoc<T> build() { - return new BuilderJavadoc<T>(basic, getsetwith, predef, predefWithJavadoc); + return new BuilderJavadoc<T>(this.basic, this.getsetwith, this.predef, this.predefWithJavadoc); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderSimple.java b/test/transform/resource/after-delombok/BuilderSimple.java index 2c031af0..925d0dd3 100644 --- a/test/transform/resource/after-delombok/BuilderSimple.java +++ b/test/transform/resource/after-delombok/BuilderSimple.java @@ -30,7 +30,7 @@ class BuilderSimple<T> { } @java.lang.SuppressWarnings("all") public BuilderSimple<T> build() { - return new BuilderSimple<T>(yes, also); + return new BuilderSimple<T>(this.yes, this.also); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java index 873fa928..ef0d8fc6 100644 --- a/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderSimpleWithSetterPrefix.java @@ -19,7 +19,7 @@ class BuilderSimpleWithSetterPrefix<T> { } @java.lang.SuppressWarnings("all") public BuilderSimpleWithSetterPrefix<T> build() { - return new BuilderSimpleWithSetterPrefix<T>(unprefixed); + return new BuilderSimpleWithSetterPrefix<T>(this.unprefixed); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnos.java b/test/transform/resource/after-delombok/BuilderTypeAnnos.java index 92a7e3f1..bd450d5b 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnos.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnos.java @@ -29,7 +29,7 @@ class BuilderTypeAnnos { } @java.lang.SuppressWarnings("all") public BuilderTypeAnnos build() { - return new BuilderTypeAnnos(foo); + return new BuilderTypeAnnos(this.foo); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java index 51261508..b221e69d 100644 --- a/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderTypeAnnosWithSetterPrefix.java @@ -29,7 +29,7 @@ class BuilderTypeAnnosWithSetterPrefix { } @java.lang.SuppressWarnings("all") public BuilderTypeAnnosWithSetterPrefix build() { - return new BuilderTypeAnnosWithSetterPrefix(foo); + return new BuilderTypeAnnosWithSetterPrefix(this.foo); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithAccessors.java b/test/transform/resource/after-delombok/BuilderWithAccessors.java index f13200cf..3fa47034 100644 --- a/test/transform/resource/after-delombok/BuilderWithAccessors.java +++ b/test/transform/resource/after-delombok/BuilderWithAccessors.java @@ -45,7 +45,7 @@ class BuilderWithAccessors { } @java.lang.SuppressWarnings("all") public BuilderWithAccessors build() { - return new BuilderWithAccessors(plower, upper, foo, _bar); + return new BuilderWithAccessors(this.plower, this.upper, this.foo, this._bar); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithBadNames.java b/test/transform/resource/after-delombok/BuilderWithBadNames.java index fee61299..d77ca71c 100644 --- a/test/transform/resource/after-delombok/BuilderWithBadNames.java +++ b/test/transform/resource/after-delombok/BuilderWithBadNames.java @@ -27,7 +27,7 @@ public class BuilderWithBadNames { } @java.lang.SuppressWarnings("all") public BuilderWithBadNames build() { - return new BuilderWithBadNames(build, toString); + return new BuilderWithBadNames(this.build, this.toString); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithDeprecated.java b/test/transform/resource/after-delombok/BuilderWithDeprecated.java index 2ac252c5..d61619ed 100644 --- a/test/transform/resource/after-delombok/BuilderWithDeprecated.java +++ b/test/transform/resource/after-delombok/BuilderWithDeprecated.java @@ -99,7 +99,7 @@ public class BuilderWithDeprecated { strings = java.util.Collections.unmodifiableList(new java.util.ArrayList<String>(this.strings)); } com.google.common.collect.ImmutableList<Integer> numbers = this.numbers == null ? com.google.common.collect.ImmutableList.<Integer>of() : this.numbers.build(); - return new BuilderWithDeprecated(dep1, dep2, strings, numbers); + return new BuilderWithDeprecated(this.dep1, this.dep2, strings, numbers); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java index 82597b6e..88eeee64 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java @@ -25,7 +25,7 @@ class BuilderWithExistingBuilderClass<T, K extends Number> { } @java.lang.SuppressWarnings("all") public BuilderWithExistingBuilderClass<String, Z> build() { - return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3); + return BuilderWithExistingBuilderClass.<Z>staticMethod(this.arg1, this.arg2, this.arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java index 0d3dcab8..b1ed5fef 100644 --- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java @@ -25,7 +25,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> { } @java.lang.SuppressWarnings("all") public BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> build() { - return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(arg1, arg2, arg3); + return BuilderWithExistingBuilderClassWithSetterPrefix.<Z>staticMethod(this.arg1, this.arg2, this.arg3); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java index cfd86ef7..d555ab06 100644 --- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java +++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethod.java @@ -18,7 +18,7 @@ class BuilderWithNoBuilderMethod { } @java.lang.SuppressWarnings("all") public BuilderWithNoBuilderMethod build() { - return new BuilderWithNoBuilderMethod(a); + return new BuilderWithNoBuilderMethod(this.a); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithNonNull.java b/test/transform/resource/after-delombok/BuilderWithNonNull.java index b32507da..9858d5bd 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNull.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNull.java @@ -25,7 +25,7 @@ class BuilderWithNonNull { } @java.lang.SuppressWarnings("all") public BuilderWithNonNull build() { - return new BuilderWithNonNull(id); + return new BuilderWithNonNull(this.id); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java index 4faeb5ce..8a27f443 100644 --- a/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java +++ b/test/transform/resource/after-delombok/BuilderWithNonNullWithSetterPrefix.java @@ -25,7 +25,7 @@ class BuilderWithNonNullWithSetterPrefix { } @java.lang.SuppressWarnings("all") public BuilderWithNonNullWithSetterPrefix build() { - return new BuilderWithNonNullWithSetterPrefix(id); + return new BuilderWithNonNullWithSetterPrefix(this.id); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java index 8a89d421..33dd7d10 100644 --- a/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java +++ b/test/transform/resource/after-delombok/BuilderWithRecursiveGenerics.java @@ -31,7 +31,7 @@ public class BuilderWithRecursiveGenerics { } @java.lang.SuppressWarnings("all") public BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz> build() { - return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(foo, bar); + return new BuilderWithRecursiveGenerics.Test<Foo, Bar, Quz>(this.foo, this.bar); } @java.lang.Override @java.lang.SuppressWarnings("all") diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilder.java b/test/transform/resource/after-delombok/BuilderWithToBuilder.java index 396bcdb6..2c4b0531 100644 --- a/test/transform/resource/after-delombok/BuilderWithToBuilder.java +++ b/ |