Updated the tests to reflect recent modifications: use 'this' where possible and add @SuppressWarnings for all generated fields and methods.

This commit is contained in:
Roel Spilker committed 2010-07-20 01:35:40 +02:00
1 parent 9b886c140c
commit 0d7df01a07
13 files changed
+104 -48

No files matched your search

@@ -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!
+8 -2
View File
@@ -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 + ")";
}
}
+22 -6
View File
@@ -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 + ")";
}
}
@@ -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;
}
}
@@ -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 {
@@ -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 {
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
@@ -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;
}
}
}
@@ -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;
}
@@ -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];
}
@@ -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 + ")";
}
}