From a97891e5f6ba635f6447aa3f42146227f0b50a26 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 17 May 2024 03:27:13 +0200 Subject: [PATCH] [tests] Continue with adjusting tests to reflect `lombok.Generated` defaulted: eclipse usually skipped tests. --- .../resource/after-ecj/DelegateGenerics.java | 6 +++--- .../resource/after-ecj/DelegateOnGetter.java | 6 +++--- .../after-ecj/DelegateOnGetterNone.java | 4 ++-- .../resource/after-ecj/DelegateOnMethods.java | 2 +- .../after-ecj/DelegateTypesAndExcludes.java | 4 ++-- .../after-ecj/DelegateWithDeprecated.java | 6 +++--- .../after-ecj/DelegateWithVarargs.java | 8 ++++---- .../after-ecj/DelegateWithVarargs2.java | 2 +- .../after-ecj/LoggerFloggerRecord.java | 2 +- .../resource/after-ecj/MixGetterVal.java | 2 +- .../resource/after-ecj/OnXJava7Style.java | 18 +++++++++--------- .../resource/after-ecj/OnXJava8StyleOn7.java | 18 +++++++++--------- .../after-ecj/TrickyTypeResolution.java | 2 +- .../after-ecj/ValDelegateMethodReference.java | 16 ++++++++-------- 14 files changed, 48 insertions(+), 48 deletions(-) diff --git a/test/transform/resource/after-ecj/DelegateGenerics.java b/test/transform/resource/after-ecj/DelegateGenerics.java index 97b05102..72819c96 100644 --- a/test/transform/resource/after-ecj/DelegateGenerics.java +++ b/test/transform/resource/after-ecj/DelegateGenerics.java @@ -3,13 +3,13 @@ public class DelegateGenerics { public DelegateGenerics() { super(); } - public @java.lang.SuppressWarnings("all") T a(final T a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated T a(final T a) { return this.target.a(a); } - public @java.lang.SuppressWarnings("all") java.lang.String i(final java.lang.String a) { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String i(final java.lang.String a) { return this.target.i(a); } - public @java.lang.SuppressWarnings("all") java.lang.Integer t(final java.lang.Integer t) { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Integer t(final java.lang.Integer t) { return this.target.t(t); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java index c23ea917..5378257a 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetter.java +++ b/test/transform/resource/after-ecj/DelegateOnGetter.java @@ -9,7 +9,7 @@ class DelegateOnGetter { DelegateOnGetter() { super(); } - public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) Bar getBar() { + public @Delegate @java.lang.SuppressWarnings({"all", "unchecked"}) @lombok.Generated Bar getBar() { java.lang.Object $value = this.bar.get(); if (($value == null)) { @@ -35,10 +35,10 @@ class DelegateOnGetter { } return (Bar) (($value == this.bar) ? null : $value); } - public @java.lang.SuppressWarnings("all") int getInt() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getInt() { return this.getBar().getInt(); } - public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setList(final java.util.ArrayList list) { this.getBar().setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java index 0cfb02c0..79cc34e8 100644 --- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java +++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java @@ -10,10 +10,10 @@ import lombok.Getter; DelegateOnGetterNone() { super(); } - public @java.lang.SuppressWarnings("all") int getInt() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getInt() { return this.bar.getInt(); } - public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setList(final java.util.ArrayList list) { this.bar.setList(list); } } diff --git a/test/transform/resource/after-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java index 6560657c..2b45bb09 100644 --- a/test/transform/resource/after-ecj/DelegateOnMethods.java +++ b/test/transform/resource/after-ecj/DelegateOnMethods.java @@ -7,7 +7,7 @@ abstract class DelegateOnMethods { super(); } public abstract @Delegate Bar getBar(); - public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void bar(final java.util.ArrayList list) { this.getBar().bar(list); } } diff --git a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java index 86f54139..096b662f 100644 --- a/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java +++ b/test/transform/resource/after-ecj/DelegateTypesAndExcludes.java @@ -27,10 +27,10 @@ class DelegatePlain { DelegatePlain() { super(); } - public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList list) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void bar(final java.util.ArrayList list) { this.bar.bar(list); } - public @java.lang.SuppressWarnings("all") void foo() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void foo() { this.foo.foo(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithDeprecated.java b/test/transform/resource/after-ecj/DelegateWithDeprecated.java index 71eb7889..6f789d48 100644 --- a/test/transform/resource/after-ecj/DelegateWithDeprecated.java +++ b/test/transform/resource/after-ecj/DelegateWithDeprecated.java @@ -9,13 +9,13 @@ class DelegateWithDeprecated { DelegateWithDeprecated() { super(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedAnnotation() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void deprecatedAnnotation() { this.bar.deprecatedAnnotation(); } - public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void deprecatedComment() { + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") @lombok.Generated void deprecatedComment() { this.bar.deprecatedComment(); } - public @java.lang.SuppressWarnings("all") void notDeprecated() { + public @java.lang.SuppressWarnings("all") @lombok.Generated void notDeprecated() { this.bar.notDeprecated(); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs.java b/test/transform/resource/after-ecj/DelegateWithVarargs.java index 71a0ca5a..83ae59a5 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs.java @@ -10,16 +10,16 @@ class DelegateWithVarargs { DelegateWithVarargs() { super(); } - public @java.lang.SuppressWarnings("all") void array(final int[] array) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void array(final int[] array) { this.bar.array(array); } - public @java.lang.SuppressWarnings("all") void arrayVarargs(final int[]... arrayVarargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void arrayVarargs(final int[]... arrayVarargs) { this.bar.arrayVarargs(arrayVarargs); } - public @java.lang.SuppressWarnings("all") void justOneParameter(final int... varargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void justOneParameter(final int... varargs) { this.bar.justOneParameter(varargs); } - public @java.lang.SuppressWarnings("all") void multipleParameters(final java.lang.String first, final int... varargs) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void multipleParameters(final java.lang.String first, final int... varargs) { this.bar.multipleParameters(first, varargs); } } diff --git a/test/transform/resource/after-ecj/DelegateWithVarargs2.java b/test/transform/resource/after-ecj/DelegateWithVarargs2.java index ed0cddf5..444f8a54 100644 --- a/test/transform/resource/after-ecj/DelegateWithVarargs2.java +++ b/test/transform/resource/after-ecj/DelegateWithVarargs2.java @@ -11,7 +11,7 @@ class DelegateWithVarargs2 { DelegateWithVarargs2() { super(); } - public @java.lang.SuppressWarnings("all") void varargs(final java.lang.Object[]... keys) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void varargs(final java.lang.Object[]... keys) { this.bar.varargs(keys); } } diff --git a/test/transform/resource/after-ecj/LoggerFloggerRecord.java b/test/transform/resource/after-ecj/LoggerFloggerRecord.java index 7db8aabe..47bf4cc6 100644 --- a/test/transform/resource/after-ecj/LoggerFloggerRecord.java +++ b/test/transform/resource/after-ecj/LoggerFloggerRecord.java @@ -3,7 +3,7 @@ import lombok.extern.flogger.Flogger; class LoggerFloggerRecord { public @Flogger record Inner(String x) { /* Implicit */ private final String x; - private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); + private static final com.google.common.flogger.FluentLogger log = com.google.common.flogger.FluentLogger.forEnclosingClass(); () { } } diff --git a/test/transform/resource/after-ecj/MixGetterVal.java b/test/transform/resource/after-ecj/MixGetterVal.java index d9809703..82d061ed 100644 --- a/test/transform/resource/after-ecj/MixGetterVal.java +++ b/test/transform/resource/after-ecj/MixGetterVal.java @@ -13,7 +13,7 @@ class MixGetterVal { final @val int a = getX(); m(a); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } \ No newline at end of file diff --git a/test/transform/resource/after-ecj/OnXJava7Style.java b/test/transform/resource/after-ecj/OnXJava7Style.java index b38c2c90..0bdb3046 100644 --- a/test/transform/resource/after-ecj/OnXJava7Style.java +++ b/test/transform/resource/after-ecj/OnXJava7Style.java @@ -20,31 +20,31 @@ public class OnXJava7Style { public OnXJava7Style() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java index 109d975a..6836e45d 100644 --- a/test/transform/resource/after-ecj/OnXJava8StyleOn7.java +++ b/test/transform/resource/after-ecj/OnXJava8StyleOn7.java @@ -20,31 +20,31 @@ public class OnXJava8StyleOn7 { public OnXJava8StyleOn7() { super(); } - public @Foo @java.lang.SuppressWarnings("all") String getA() { + public @Foo @java.lang.SuppressWarnings("all") @lombok.Generated String getA() { return this.a; } - public @Foo() @java.lang.SuppressWarnings("all") void setB(final String b) { + public @Foo() @java.lang.SuppressWarnings("all") @lombok.Generated void setB(final String b) { this.b = b; } - public @java.lang.SuppressWarnings("all") void setC(final @Foo("a") String c) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setC(final @Foo("a") String c) { this.c = c; } - public @java.lang.SuppressWarnings("all") void setD(final @Bar(stuff = "b") String d) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setD(final @Bar(stuff = "b") String d) { this.d = d; } - public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") String getE() { + public @Foo(value = "c") @Bar(stuff = "d") @java.lang.SuppressWarnings("all") @lombok.Generated String getE() { return this.e; } - public @Array @java.lang.SuppressWarnings("all") String getF() { + public @Array @java.lang.SuppressWarnings("all") @lombok.Generated String getF() { return this.f; } - public @Array() @java.lang.SuppressWarnings("all") String getG() { + public @Array() @java.lang.SuppressWarnings("all") @lombok.Generated String getG() { return this.g; } - public @Array({}) @java.lang.SuppressWarnings("all") String getH() { + public @Array({}) @java.lang.SuppressWarnings("all") @lombok.Generated String getH() { return this.h; } - public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") String getI() { + public @Array({"a", "b"}) @java.lang.SuppressWarnings("all") @lombok.Generated String getI() { return this.i; } } diff --git a/test/transform/resource/after-ecj/TrickyTypeResolution.java b/test/transform/resource/after-ecj/TrickyTypeResolution.java index 4553aaba..67bab8b7 100644 --- a/test/transform/resource/after-ecj/TrickyTypeResolution.java +++ b/test/transform/resource/after-ecj/TrickyTypeResolution.java @@ -20,7 +20,7 @@ class TrickySuccess { TrickySuccess() { super(); } - public @java.lang.SuppressWarnings("all") int getX() { + public @java.lang.SuppressWarnings("all") @lombok.Generated int getX() { return this.x; } } diff --git a/test/transform/resource/after-ecj/ValDelegateMethodReference.java b/test/transform/resource/after-ecj/ValDelegateMethodReference.java index cfd0dab2..bcc54e26 100644 --- a/test/transform/resource/after-ecj/ValDelegateMethodReference.java +++ b/test/transform/resource/after-ecj/ValDelegateMethodReference.java @@ -24,16 +24,16 @@ class Entity { Entity() { super(); } - public @java.lang.SuppressWarnings("all") java.lang.Boolean getABoolean() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.Boolean getABoolean() { return this.innerDelegate.getABoolean(); } - public @java.lang.SuppressWarnings("all") java.lang.String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String getValue() { return this.innerDelegate.getValue(); } - public @java.lang.SuppressWarnings("all") void setABoolean(final java.lang.Boolean aBoolean) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setABoolean(final java.lang.Boolean aBoolean) { this.innerDelegate.setABoolean(aBoolean); } - public @java.lang.SuppressWarnings("all") void setValue(final java.lang.String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final java.lang.String value) { this.innerDelegate.setValue(value); } } @@ -43,16 +43,16 @@ class Entity { MyDelegate() { super(); } - public @java.lang.SuppressWarnings("all") String getValue() { + public @java.lang.SuppressWarnings("all") @lombok.Generated String getValue() { return this.value; } - public @java.lang.SuppressWarnings("all") Boolean getABoolean() { + public @java.lang.SuppressWarnings("all") @lombok.Generated Boolean getABoolean() { return this.aBoolean; } - public @java.lang.SuppressWarnings("all") void setValue(final String value) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setValue(final String value) { this.value = value; } - public @java.lang.SuppressWarnings("all") void setABoolean(final Boolean aBoolean) { + public @java.lang.SuppressWarnings("all") @lombok.Generated void setABoolean(final Boolean aBoolean) { this.aBoolean = aBoolean; } }