From 0d7df01a0711604ce3da57e11815d376c7071870 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 20 Jul 2010 01:35:40 +0200 Subject: Updated the tests to reflect recent modifications: use 'this' where possible and add @SuppressWarnings for all generated fields and methods. --- .../resource/after/CommentsInterspersed.java | 3 ++- test/delombok/resource/after/DataIgnore.java | 10 ++++++-- test/delombok/resource/after/DataPlain.java | 28 +++++++++++++++++----- .../delombok/resource/after/GetterAccessLevel.java | 27 ++++++++++++++------- .../resource/after/GetterAlreadyExists.java | 24 ++++++++++++------- test/delombok/resource/after/GetterBoolean.java | 9 ++++--- test/delombok/resource/after/GetterPlain.java | 6 +++-- test/delombok/resource/after/GetterWithDollar.java | 8 +++---- test/delombok/resource/after/NonNullPlain.java | 12 +++++----- .../delombok/resource/after/SetterAccessLevel.java | 7 +++++- test/delombok/resource/after/SetterPlain.java | 2 ++ .../delombok/resource/after/SynchronizedPlain.java | 10 ++++---- test/delombok/resource/after/ToStringPlain.java | 6 +++-- 13 files changed, 104 insertions(+), 48 deletions(-) diff --git a/test/delombok/resource/after/CommentsInterspersed.java b/test/delombok/resource/after/CommentsInterspersed.java index ddc716c9..5aaafe42 100644 --- a/test/delombok/resource/after/CommentsInterspersed.java +++ b/test/delombok/resource/after/CommentsInterspersed.java @@ -7,8 +7,9 @@ public class CommentsInterspersed { public native void gwtTest(); /*-{ javascript; }-*/ + @java.lang.SuppressWarnings("all") public String getTest() { - return test; + return this.test; } } //haha! //hahaha! diff --git a/test/delombok/resource/after/DataIgnore.java b/test/delombok/resource/after/DataIgnore.java index 706d7b59..feb2c0ef 100644 --- a/test/delombok/resource/after/DataIgnore.java +++ b/test/delombok/resource/after/DataIgnore.java @@ -1,13 +1,17 @@ class DataIgnore { final int x; String $name; + @java.beans.ConstructorProperties({"x"}) + @java.lang.SuppressWarnings("all") public DataIgnore(final int x) { this.x = x; } + @java.lang.SuppressWarnings("all") public int getX() { - return x; + return this.x; } @java.lang.Override + @java.lang.SuppressWarnings("all") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (o == null) return false; @@ -17,6 +21,7 @@ class DataIgnore { return true; } @java.lang.Override + @java.lang.SuppressWarnings("all") public int hashCode() { final int PRIME = 31; int result = 1; @@ -24,7 +29,8 @@ class DataIgnore { return result; } @java.lang.Override + @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "DataIgnore(x=" + x + ")"; + return "DataIgnore(x=" + this.x + ")"; } } diff --git a/test/delombok/resource/after/DataPlain.java b/test/delombok/resource/after/DataPlain.java index 6b7aeae6..2938a46e 100644 --- a/test/delombok/resource/after/DataPlain.java +++ b/test/delombok/resource/after/DataPlain.java @@ -1,19 +1,25 @@ class Data1 { final int x; String name; + @java.beans.ConstructorProperties({"x"}) + @java.lang.SuppressWarnings("all") public Data1(final int x) { this.x = x; } + @java.lang.SuppressWarnings("all") public int getX() { - return x; + return this.x; } + @java.lang.SuppressWarnings("all") public String getName() { - return name; + return this.name; } + @java.lang.SuppressWarnings("all") public void setName(final String name) { this.name = name; } @java.lang.Override + @java.lang.SuppressWarnings("all") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (o == null) return false; @@ -24,6 +30,7 @@ class Data1 { return true; } @java.lang.Override + @java.lang.SuppressWarnings("all") public int hashCode() { final int PRIME = 31; int result = 1; @@ -32,26 +39,33 @@ class Data1 { return result; } @java.lang.Override + @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "Data1(x=" + x + ", name=" + name + ")"; + return "Data1(x=" + this.x + ", name=" + this.name + ")"; } } class Data2 { final int x; String name; + @java.beans.ConstructorProperties({"x"}) + @java.lang.SuppressWarnings("all") public Data2(final int x) { this.x = x; } + @java.lang.SuppressWarnings("all") public int getX() { - return x; + return this.x; } + @java.lang.SuppressWarnings("all") public String getName() { - return name; + return this.name; } + @java.lang.SuppressWarnings("all") public void setName(final String name) { this.name = name; } @java.lang.Override + @java.lang.SuppressWarnings("all") public boolean equals(final java.lang.Object o) { if (o == this) return true; if (o == null) return false; @@ -62,6 +76,7 @@ class Data2 { return true; } @java.lang.Override + @java.lang.SuppressWarnings("all") public int hashCode() { final int PRIME = 31; int result = 1; @@ -70,7 +85,8 @@ class Data2 { return result; } @java.lang.Override + @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "Data2(x=" + x + ", name=" + name + ")"; + return "Data2(x=" + this.x + ", name=" + this.name + ")"; } } diff --git a/test/delombok/resource/after/GetterAccessLevel.java b/test/delombok/resource/after/GetterAccessLevel.java index e117b72a..6d977d87 100644 --- a/test/delombok/resource/after/GetterAccessLevel.java +++ b/test/delombok/resource/after/GetterAccessLevel.java @@ -10,31 +10,40 @@ class GetterAccessLevel { String protectedString; String publicString; String value; + @java.lang.SuppressWarnings("all") private boolean isPrivate() { - return isPrivate; + return this.isPrivate; } + @java.lang.SuppressWarnings("all") boolean isPackage() { - return isPackage; + return this.isPackage; } + @java.lang.SuppressWarnings("all") protected boolean isProtected() { - return isProtected; + return this.isProtected; } + @java.lang.SuppressWarnings("all") public boolean isPublic() { - return isPublic; + return this.isPublic; } + @java.lang.SuppressWarnings("all") private String getPrivateString() { - return privateString; + return this.privateString; } + @java.lang.SuppressWarnings("all") String getPackageString() { - return packageString; + return this.packageString; } + @java.lang.SuppressWarnings("all") protected String getProtectedString() { - return protectedString; + return this.protectedString; } + @java.lang.SuppressWarnings("all") public String getPublicString() { - return publicString; + return this.publicString; } + @java.lang.SuppressWarnings("all") public String getValue() { - return value; + return this.value; } } \ No newline at end of file diff --git a/test/delombok/resource/after/GetterAlreadyExists.java b/test/delombok/resource/after/GetterAlreadyExists.java index fce1ba41..6a5377ba 100644 --- a/test/delombok/resource/after/GetterAlreadyExists.java +++ b/test/delombok/resource/after/GetterAlreadyExists.java @@ -21,8 +21,9 @@ class Getter4 { String hasFoo() { return null; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter5 { @@ -30,8 +31,9 @@ class Getter5 { String isFoo() { return null; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter6 { @@ -45,8 +47,9 @@ class Getter7 { boolean hasFoo() { return false; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter8 { @@ -54,8 +57,9 @@ class Getter8 { boolean isFoo() { return false; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter9 { @@ -87,8 +91,9 @@ class Getter13 { static boolean hasFoo() { return false; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter14 { @@ -96,8 +101,9 @@ class Getter14 { static boolean isFoo() { return false; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter15 { @@ -111,8 +117,9 @@ class Getter16 { static String hasFoo() { return false; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter17 { @@ -120,8 +127,9 @@ class Getter17 { static String isFoo() { return false; } + @java.lang.SuppressWarnings("all") public String getFoo() { - return foo; + return this.foo; } } class Getter18 { diff --git a/test/delombok/resource/after/GetterBoolean.java b/test/delombok/resource/after/GetterBoolean.java index 639d6dc9..a727e49b 100644 --- a/test/delombok/resource/after/GetterBoolean.java +++ b/test/delombok/resource/after/GetterBoolean.java @@ -2,14 +2,17 @@ class Getter { boolean foo; boolean isBar; boolean hasBaz; + @java.lang.SuppressWarnings("all") public boolean isFoo() { - return foo; + return this.foo; } + @java.lang.SuppressWarnings("all") public boolean isBar() { - return isBar; + return this.isBar; } + @java.lang.SuppressWarnings("all") public boolean hasBaz() { - return hasBaz; + return this.hasBaz; } } class MoreGetter { diff --git a/test/delombok/resource/after/GetterPlain.java b/test/delombok/resource/after/GetterPlain.java index 5e8cc965..359d46e2 100644 --- a/test/delombok/resource/after/GetterPlain.java +++ b/test/delombok/resource/after/GetterPlain.java @@ -1,10 +1,12 @@ class GetterPlain { int i; int foo; + @java.lang.SuppressWarnings("all") public int getI() { - return i; + return this.i; } + @java.lang.SuppressWarnings("all") public int getFoo() { - return foo; + return this.foo; } } \ No newline at end of file diff --git a/test/delombok/resource/after/GetterWithDollar.java b/test/delombok/resource/after/GetterWithDollar.java index 56be0249..9e02ccb8 100644 --- a/test/delombok/resource/after/GetterWithDollar.java +++ b/test/delombok/resource/after/GetterWithDollar.java @@ -1,15 +1,15 @@ class GetterWithDollar1 { int $i; - + @java.lang.SuppressWarnings("all") public int getI() { - return $i; + return this.$i; } } class GetterWithDollar2 { int $i; int i; - + @java.lang.SuppressWarnings("all") public int getI() { - return i; + return this.i; } } \ No newline at end of file diff --git a/test/delombok/resource/after/NonNullPlain.java b/test/delombok/resource/after/NonNullPlain.java index 2d7ebb4f..19869db1 100644 --- a/test/delombok/resource/after/NonNullPlain.java +++ b/test/delombok/resource/after/NonNullPlain.java @@ -3,21 +3,21 @@ class NonNullPlain { int i; @lombok.NonNull String s; - @lombok.NonNull + @java.lang.SuppressWarnings("all") public int getI() { - return i; + return this.i; } - + @java.lang.SuppressWarnings("all") public void setI(@lombok.NonNull final int i) { this.i = i; } - @lombok.NonNull + @java.lang.SuppressWarnings("all") public String getS() { - return s; + return this.s; } - + @java.lang.SuppressWarnings("all") public void setS(@lombok.NonNull final String s) { if (s == null) throw new java.lang.NullPointerException("s"); this.s = s; diff --git a/test/delombok/resource/after/SetterAccessLevel.java b/test/delombok/resource/after/SetterAccessLevel.java index d4e7ac23..dce4cc2f 100644 --- a/test/delombok/resource/after/SetterAccessLevel.java +++ b/test/delombok/resource/after/SetterAccessLevel.java @@ -5,19 +5,24 @@ class SetterAccessLevel { boolean isProtected; boolean isPublic; boolean value; + @java.lang.SuppressWarnings("all") private void setIsPrivate(final boolean isPrivate) { this.isPrivate = isPrivate; } + @java.lang.SuppressWarnings("all") void setIsPackage(final boolean isPackage) { this.isPackage = isPackage; } + @java.lang.SuppressWarnings("all") protected void setIsProtected(final boolean isProtected) { this.isProtected = isProtected; } + @java.lang.SuppressWarnings("all") public void setIsPublic(final boolean isPublic) { this.isPublic = isPublic; } + @java.lang.SuppressWarnings("all") public void setValue(final boolean value) { this.value = value; } -} +} \ No newline at end of file diff --git a/test/delombok/resource/after/SetterPlain.java b/test/delombok/resource/after/SetterPlain.java index 8faad0ec..39aa7b61 100644 --- a/test/delombok/resource/after/SetterPlain.java +++ b/test/delombok/resource/after/SetterPlain.java @@ -1,9 +1,11 @@ class SetterPlain { int i; int foo; + @java.lang.SuppressWarnings("all") public void setI(final int i) { this.i = i; } + @java.lang.SuppressWarnings("all") public void setFoo(final int foo) { this.foo = foo; } diff --git a/test/delombok/resource/after/SynchronizedPlain.java b/test/delombok/resource/after/SynchronizedPlain.java index fcbe03f2..695a3089 100644 --- a/test/delombok/resource/after/SynchronizedPlain.java +++ b/test/delombok/resource/after/SynchronizedPlain.java @@ -1,26 +1,28 @@ class SynchronizedPlain1 { void test() { - synchronized ($lock) { + synchronized (this.$lock) { System.out.println("one"); } } void test2() { - synchronized ($lock) { + synchronized (this.$lock) { System.out.println("two"); } } + @java.lang.SuppressWarnings("all") private final java.lang.Object $lock = new java.lang.Object[0]; } class SynchronizedPlain2 { static void test() { - synchronized ($LOCK) { + synchronized (SynchronizedPlain2.$LOCK) { System.out.println("three"); } } static void test2() { - synchronized ($LOCK) { + synchronized (SynchronizedPlain2.$LOCK) { System.out.println("four"); } } + @java.lang.SuppressWarnings("all") private static final java.lang.Object $LOCK = new java.lang.Object[0]; } \ No newline at end of file diff --git a/test/delombok/resource/after/ToStringPlain.java b/test/delombok/resource/after/ToStringPlain.java index 4f71e392..20227464 100644 --- a/test/delombok/resource/after/ToStringPlain.java +++ b/test/delombok/resource/after/ToStringPlain.java @@ -2,15 +2,17 @@ class ToString1 { final int x; String name; @java.lang.Override + @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "ToString1(x=" + x + ", name=" + name + ")"; + return "ToString1(x=" + this.x + ", name=" + this.name + ")"; } } class ToString2 { final int x; String name; @java.lang.Override + @java.lang.SuppressWarnings("all") public java.lang.String toString() { - return "ToString2(x=" + x + ", name=" + name + ")"; + return "ToString2(x=" + this.x + ", name=" + this.name + ")"; } } \ No newline at end of file -- cgit