From 4cfdf214300869ccdc893bb3bcd91910b02300e7 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Fri, 21 Aug 2026 02:57:22 +0200 Subject: [PATCH] [test] Fix tests to reflect updates to `@CheckReturnValue` feature. --- .../after-delombok/CheckReturnValueBuilder.java | 1 + .../after-delombok/CheckReturnValueOff.java | 14 -------------- .../after-delombok/CheckerFrameworkBasic.java | 1 + .../after-delombok/CheckerFrameworkBuilder.java | 2 ++ .../CheckerFrameworkSuperBuilder.java | 2 ++ .../after-ecj/CheckReturnValueBuilder.java | 2 +- .../resource/after-ecj/CheckReturnValueOff.java | 14 -------------- .../resource/after-ecj/CheckerFrameworkBasic.java | 2 +- .../after-ecj/CheckerFrameworkBuilder.java | 4 ++-- .../resource/before/CheckReturnValueOff.java | 9 --------- 10 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 test/transform/resource/after-delombok/CheckReturnValueOff.java delete mode 100644 test/transform/resource/after-ecj/CheckReturnValueOff.java delete mode 100644 test/transform/resource/before/CheckReturnValueOff.java diff --git a/test/transform/resource/after-delombok/CheckReturnValueBuilder.java b/test/transform/resource/after-delombok/CheckReturnValueBuilder.java index c8d84291..f8288793 100644 --- a/test/transform/resource/after-delombok/CheckReturnValueBuilder.java +++ b/test/transform/resource/after-delombok/CheckReturnValueBuilder.java @@ -45,6 +45,7 @@ class CheckReturnValueBuilder { return new CheckReturnValueBuilder(this.x, this.name); } @java.lang.Override + @lombok.CheckReturnValue @java.lang.SuppressWarnings("all") @lombok.Generated public java.lang.String toString() { diff --git a/test/transform/resource/after-delombok/CheckReturnValueOff.java b/test/transform/resource/after-delombok/CheckReturnValueOff.java deleted file mode 100644 index ecffc92e..00000000 --- a/test/transform/resource/after-delombok/CheckReturnValueOff.java +++ /dev/null @@ -1,14 +0,0 @@ -class CheckReturnValueOff { - final int x; - CheckReturnValueOff(int x) { - this.x = x; - } - /** - * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). - */ - @java.lang.SuppressWarnings("all") - @lombok.Generated - public CheckReturnValueOff withX(final int x) { - return this.x == x ? this : new CheckReturnValueOff(x); - } -} diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java index 62c8b0c7..dd59b9eb 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBasic.java @@ -70,6 +70,7 @@ class CheckerFrameworkBasic { public java.lang.String toString() { return "CheckerFrameworkBasic(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")"; } + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated public CheckerFrameworkBasic(final int x, final int y, final int z) { diff --git a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java index 5c31e346..c19bf5cf 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkBuilder.java @@ -11,6 +11,7 @@ class CheckerFrameworkBuilder { private static int $default$x() { return 5; } + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { @@ -37,6 +38,7 @@ class CheckerFrameworkBuilder { @java.lang.SuppressWarnings("all") @lombok.Generated private java.util.ArrayList names; + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilderBuilder() { diff --git a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java index 000b2816..8e62a8b7 100644 --- a/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java +++ b/test/transform/resource/after-delombok/CheckerFrameworkSuperBuilder.java @@ -100,6 +100,7 @@ class CheckerFrameworkSuperBuilder { @java.lang.SuppressWarnings("all") @lombok.Generated private static final class ParentBuilderImpl extends CheckerFrameworkSuperBuilder.Parent.ParentBuilder { + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated private ParentBuilderImpl() { @@ -207,6 +208,7 @@ class CheckerFrameworkSuperBuilder { @java.lang.SuppressWarnings("all") @lombok.Generated private static final class ZChildBuilderImpl extends CheckerFrameworkSuperBuilder.ZChild.ZChildBuilder { + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated private ZChildBuilderImpl() { diff --git a/test/transform/resource/after-ecj/CheckReturnValueBuilder.java b/test/transform/resource/after-ecj/CheckReturnValueBuilder.java index d7da093d..fa85fea1 100644 --- a/test/transform/resource/after-ecj/CheckReturnValueBuilder.java +++ b/test/transform/resource/after-ecj/CheckReturnValueBuilder.java @@ -22,7 +22,7 @@ public @lombok.CheckReturnValue @java.lang.SuppressWarnings("all") @lombok.Generated CheckReturnValueBuilder build() { return new CheckReturnValueBuilder(this.x, this.name); } - public @java.lang.Override @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { + public @java.lang.Override @lombok.CheckReturnValue @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((("CheckReturnValueBuilder.CheckReturnValueBuilderBuilder(x=" + this.x) + ", name=") + this.name) + ")"); } } diff --git a/test/transform/resource/after-ecj/CheckReturnValueOff.java b/test/transform/resource/after-ecj/CheckReturnValueOff.java deleted file mode 100644 index b786cdbc..00000000 --- a/test/transform/resource/after-ecj/CheckReturnValueOff.java +++ /dev/null @@ -1,14 +0,0 @@ -import lombok.With; -class CheckReturnValueOff { - final @With int x; - CheckReturnValueOff(int x) { - super(); - this.x = x; - } - /** - * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed). - */ - public @java.lang.SuppressWarnings("all") @lombok.Generated CheckReturnValueOff withX(final int x) { - return ((this.x == x) ? this : new CheckReturnValueOff(x)); - } -} diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java index a52e0c2c..8687d8f2 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBasic.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBasic.java @@ -58,7 +58,7 @@ import lombok.With; public @java.lang.Override @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated java.lang.String toString() { return (((((("CheckerFrameworkBasic(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")"); } - public @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBasic(final int x, final int y, final int z) { + public @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBasic(final int x, final int y, final int z) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java index 15872a12..1d40f35f 100644 --- a/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java +++ b/test/transform/resource/after-ecj/CheckerFrameworkBuilder.java @@ -8,7 +8,7 @@ import lombok.Singular; private @java.lang.SuppressWarnings("all") @lombok.Generated int y; private @java.lang.SuppressWarnings("all") @lombok.Generated int z; private @java.lang.SuppressWarnings("all") @lombok.Generated java.util.ArrayList names; - @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilderBuilder() { + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilderBuilder() { super(); } /** @@ -82,7 +82,7 @@ import lombok.Singular; private static @java.lang.SuppressWarnings("all") @lombok.Generated int $default$x() { return 5; } - @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { + @org.checkerframework.dataflow.qual.SideEffectFree @java.lang.SuppressWarnings("all") @lombok.Generated CheckerFrameworkBuilder(final int x, final int y, final int z, final List names) { super(); this.x = x; this.y = y; diff --git a/test/transform/resource/before/CheckReturnValueOff.java b/test/transform/resource/before/CheckReturnValueOff.java deleted file mode 100644 index 7197fc75..00000000 --- a/test/transform/resource/before/CheckReturnValueOff.java +++ /dev/null @@ -1,9 +0,0 @@ -//CONF: lombok.checkReturnValueAnnotation = none -import lombok.With; -class CheckReturnValueOff { - @With final int x; - - CheckReturnValueOff(int x) { - this.x = x; - } -}