tiennm99/lombok
1
0 Fork 0
mirror of https://github.com/tiennm99/lombok.git synced 2026-10-13 04:15:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit tests to take into account work on issue 289 and 287.

Browse Source
This commit is contained in:
Roel Spilker committed 2011-11-01 00:53:21 +01:00
1 parent 58f0117d20
commit 2fcfc4c3dc
22 files changed
+53 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/transform/resource/after-delombok/DataOnLocalClass.java
+2 -2
View File
@@ -77,7 +77,7 @@ class DataOnLocalClass2 {
@java.lang.SuppressWarnings("all")
public boolean equals(final java.lang.Object o) {
if (o == this) return true;
if (!(o instanceof InnerLocal)) return false;
if (!(o instanceof Local.InnerLocal)) return false;
final InnerLocal other = (InnerLocal)o;
if (!other.canEqual((java.lang.Object)this)) return false;
if (this.getName() == null ? other.getName() != null : !this.getName().equals((java.lang.Object)other.getName())) return false;
@@ -85,7 +85,7 @@ class DataOnLocalClass2 {
}
@java.lang.SuppressWarnings("all")
public boolean canEqual(final java.lang.Object other) {
return other instanceof InnerLocal;
return other instanceof Local.InnerLocal;
}
@java.lang.Override
@java.lang.SuppressWarnings("all")
test/transform/resource/after-delombok/NonNullPlain.java
+3 -7
View File
@@ -13,14 +13,12 @@ class NonNullPlain {
public @interface NotNull {
}
@java.beans.ConstructorProperties({"i", "s", "o"})
@java.beans.ConstructorProperties({"i", "s"})
@java.lang.SuppressWarnings("all")
public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s, @NotNull final Object o) {
public NonNullPlain(@lombok.NonNull final int i, @lombok.NonNull final String s) {
if (s == null) throw new java.lang.NullPointerException("s");
if (o == null) throw new java.lang.NullPointerException("o");
this.i = i;
this.s = s;
this.o = o;
}
@lombok.NonNull
@@ -35,7 +33,6 @@ class NonNullPlain {
return this.s;
}
@NotNull
@java.lang.SuppressWarnings("all")
public Object getO() {
return this.o;
@@ -53,8 +50,7 @@ class NonNullPlain {
}
@java.lang.SuppressWarnings("all")
public void setO(@NotNull final Object o) {
if (o == null) throw new java.lang.NullPointerException("o");
public void setO(final Object o) {
this.o = o;
}
}
test/transform/resource/after-ecj/DataExtended.java
+1 -1
View File
@@ -14,7 +14,7 @@
return true;
if ((! (o instanceof DataExtended)))
return false;
final DataExtended other = (DataExtended) o;
final @java.lang.SuppressWarnings("all") DataExtended other = (DataExtended) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-ecj/DataIgnore.java
+1 -1
View File
@@ -13,7 +13,7 @@
return true;
if ((! (o instanceof DataIgnore)))
return false;
final DataIgnore other = (DataIgnore) o;
final @java.lang.SuppressWarnings("all") DataIgnore other = (DataIgnore) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-ecj/DataOnLocalClass.java
+5 -5
View File
@@ -25,7 +25,7 @@ class DataOnLocalClass1 {
return true;
if ((! (o instanceof Local)))
return false;
final Local other = (Local) o;
final @java.lang.SuppressWarnings("all") Local other = (Local) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
@@ -72,9 +72,9 @@ class DataOnLocalClass2 {
public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
if ((o == this))
return true;
if ((! (o instanceof InnerLocal)))
if ((! (o instanceof Local.InnerLocal)))
return false;
final InnerLocal other = (InnerLocal) o;
final @java.lang.SuppressWarnings("all") InnerLocal other = (InnerLocal) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -82,7 +82,7 @@ class DataOnLocalClass2 {
return true;
}
public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
return (other instanceof InnerLocal);
return (other instanceof Local.InnerLocal);
}
public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
final int PRIME = 31;
@@ -107,7 +107,7 @@ class DataOnLocalClass2 {
return true;
if ((! (o instanceof Local)))
return false;
final Local other = (Local) o;
final @java.lang.SuppressWarnings("all") Local other = (Local) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-ecj/DataPlain.java
+5 -5
View File
@@ -20,7 +20,7 @@ import lombok.Data;
return true;
if ((! (o instanceof Data1)))
return false;
final Data1 other = (Data1) o;
final @java.lang.SuppressWarnings("all") Data1 other = (Data1) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
@@ -64,7 +64,7 @@ import lombok.Data;
return true;
if ((! (o instanceof Data2)))
return false;
final Data2 other = (Data2) o;
final @java.lang.SuppressWarnings("all") Data2 other = (Data2) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
@@ -108,7 +108,7 @@ final @Data class Data3 {
return true;
if ((! (o instanceof Data3)))
return false;
final Data3 other = (Data3) o;
final @java.lang.SuppressWarnings("all") Data3 other = (Data3) o;
if ((this.getX() != other.getX()))
return false;
if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -139,7 +139,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
return true;
if ((! (o instanceof Data4)))
return false;
final Data4 other = (Data4) o;
final @java.lang.SuppressWarnings("all") Data4 other = (Data4) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((! super.equals(o)))
@@ -171,7 +171,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
return true;
if ((! (o instanceof Data5)))
return false;
final Data5 other = (Data5) o;
final @java.lang.SuppressWarnings("all") Data5 other = (Data5) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
return true;
test/transform/resource/after-ecj/DataWithGetter.java
+1 -1
View File
@@ -17,7 +17,7 @@
return true;
if ((! (o instanceof DataWithGetter)))
return false;
final DataWithGetter other = (DataWithGetter) o;
final @java.lang.SuppressWarnings("all") DataWithGetter other = (DataWithGetter) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-ecj/DataWithGetterNone.java
+1 -1
View File
@@ -17,7 +17,7 @@
return true;
if ((! (o instanceof DataWithGetterNone)))
return false;
final DataWithGetterNone other = (DataWithGetterNone) o;
final @java.lang.SuppressWarnings("all") DataWithGetterNone other = (DataWithGetterNone) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.x != other.x))
test/transform/resource/after-ecj/EqualsAndHashCode.java
+4 -4
View File
@@ -8,7 +8,7 @@
return true;
if ((! (o instanceof EqualsAndHashCode)))
return false;
final EqualsAndHashCode other = (EqualsAndHashCode) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode other = (EqualsAndHashCode) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.x != other.x))
@@ -44,7 +44,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
return true;
if ((! (o instanceof EqualsAndHashCode2)))
return false;
final EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
if ((this.x != other.x))
return false;
return true;
@@ -65,7 +65,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
return true;
if ((! (o instanceof EqualsAndHashCode3)))
return false;
final EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
return true;
@@ -87,7 +87,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
return true;
if ((! (o instanceof EqualsAndHashCode4)))
return false;
final EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((! super.equals(o)))
test/transform/resource/after-ecj/GetterLazyEahcToString.java
+1 -1
View File
@@ -25,7 +25,7 @@
return true;
if ((! (o instanceof GetterLazyEahcToString)))
return false;
final GetterLazyEahcToString other = (GetterLazyEahcToString) o;
final @java.lang.SuppressWarnings("all") GetterLazyEahcToString other = (GetterLazyEahcToString) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if (((this.getValue() == null) ? (other.getValue() != null) : (! this.getValue().equals((java.lang.Object) other.getValue()))))
test/transform/resource/after-ecj/NonNullPlain.java
+3 -8
View File
@@ -5,15 +5,12 @@ import java.lang.annotation.*;
@lombok.NonNull int i;
@lombok.NonNull String s;
@NotNull Object o;
public @java.beans.ConstructorProperties({"i", "s", "o"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s, final @NotNull Object o) {
public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
super();
if ((s == null))
throw new java.lang.NullPointerException("s");
if ((o == null))
throw new java.lang.NullPointerException("o");
this.i = i;
this.s = s;
this.o = o;
}
public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
return this.i;
@@ -21,7 +18,7 @@ import java.lang.annotation.*;
public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
return this.s;
}
public @NotNull @java.lang.SuppressWarnings("all") Object getO() {
public @java.lang.SuppressWarnings("all") Object getO() {
return this.o;
}
public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
@@ -32,9 +29,7 @@ import java.lang.annotation.*;
throw new java.lang.NullPointerException("s");
this.s = s;
}
public @java.lang.SuppressWarnings("all") void setO(final @NotNull Object o) {
if ((o == null))
throw new java.lang.NullPointerException("o");
public @java.lang.SuppressWarnings("all") void setO(final Object o) {
this.o = o;
}
}
test/transform/resource/after-ecj/SynchronizedPlain.java
+2 -2
View File
@@ -1,6 +1,6 @@
import lombok.Synchronized;
class SynchronizedPlain1 {
private final @java.lang.SuppressWarnings("all") java.lang.Object $lock = new java.lang.Object[0];
private final java.lang.Object $lock = new java.lang.Object[0];
SynchronizedPlain1() {
super();
}
@@ -18,7 +18,7 @@ class SynchronizedPlain1 {
}
}
class SynchronizedPlain2 {
private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0];
private static final java.lang.Object $LOCK = new java.lang.Object[0];
<clinit>() {
}
SynchronizedPlain2() {
test/transform/resource/after-eclipse/DataExtended.java
+1 -1
View File
@@ -14,7 +14,7 @@
return true;
if ((! (o instanceof DataExtended)))
return false;
final DataExtended other = (DataExtended) o;
final @java.lang.SuppressWarnings("all") DataExtended other = (DataExtended) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-eclipse/DataIgnore.java
+1 -1
View File
@@ -13,7 +13,7 @@
return true;
if ((! (o instanceof DataIgnore)))
return false;
final DataIgnore other = (DataIgnore) o;
final @java.lang.SuppressWarnings("all") DataIgnore other = (DataIgnore) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-eclipse/DataOnLocalClass.java
+5 -5
View File
@@ -25,7 +25,7 @@ class DataOnLocalClass1 {
return true;
if ((! (o instanceof Local)))
return false;
final Local other = (Local) o;
final @java.lang.SuppressWarnings("all") Local other = (Local) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
@@ -72,9 +72,9 @@ class DataOnLocalClass2 {
public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
if ((o == this))
return true;
if ((! (o instanceof InnerLocal)))
if ((! (o instanceof Local.InnerLocal)))
return false;
final InnerLocal other = (InnerLocal) o;
final @java.lang.SuppressWarnings("all") InnerLocal other = (InnerLocal) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -82,7 +82,7 @@ class DataOnLocalClass2 {
return true;
}
public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
return (other instanceof InnerLocal);
return (other instanceof Local.InnerLocal);
}
public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
final int PRIME = 31;
@@ -107,7 +107,7 @@ class DataOnLocalClass2 {
return true;
if ((! (o instanceof Local)))
return false;
final Local other = (Local) o;
final @java.lang.SuppressWarnings("all") Local other = (Local) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-eclipse/DataPlain.java
+5 -5
View File
@@ -20,7 +20,7 @@ import lombok.Data;
return true;
if ((! (o instanceof Data1)))
return false;
final Data1 other = (Data1) o;
final @java.lang.SuppressWarnings("all") Data1 other = (Data1) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
@@ -64,7 +64,7 @@ import lombok.Data;
return true;
if ((! (o instanceof Data2)))
return false;
final Data2 other = (Data2) o;
final @java.lang.SuppressWarnings("all") Data2 other = (Data2) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
@@ -108,7 +108,7 @@ final @Data class Data3 {
return true;
if ((! (o instanceof Data3)))
return false;
final Data3 other = (Data3) o;
final @java.lang.SuppressWarnings("all") Data3 other = (Data3) o;
if ((this.getX() != other.getX()))
return false;
if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
@@ -139,7 +139,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
return true;
if ((! (o instanceof Data4)))
return false;
final Data4 other = (Data4) o;
final @java.lang.SuppressWarnings("all") Data4 other = (Data4) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((! super.equals(o)))
@@ -171,7 +171,7 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
return true;
if ((! (o instanceof Data5)))
return false;
final Data5 other = (Data5) o;
final @java.lang.SuppressWarnings("all") Data5 other = (Data5) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
return true;
test/transform/resource/after-eclipse/DataWithGetter.java
+1 -1
View File
@@ -17,7 +17,7 @@
return true;
if ((! (o instanceof DataWithGetter)))
return false;
final DataWithGetter other = (DataWithGetter) o;
final @java.lang.SuppressWarnings("all") DataWithGetter other = (DataWithGetter) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.getX() != other.getX()))
test/transform/resource/after-eclipse/DataWithGetterNone.java
+1 -1
View File
@@ -17,7 +17,7 @@
return true;
if ((! (o instanceof DataWithGetterNone)))
return false;
final DataWithGetterNone other = (DataWithGetterNone) o;
final @java.lang.SuppressWarnings("all") DataWithGetterNone other = (DataWithGetterNone) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.x != other.x))
test/transform/resource/after-eclipse/EqualsAndHashCode.java
+4 -4
View File
@@ -8,7 +8,7 @@
return true;
if ((! (o instanceof EqualsAndHashCode)))
return false;
final EqualsAndHashCode other = (EqualsAndHashCode) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode other = (EqualsAndHashCode) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((this.x != other.x))
@@ -44,7 +44,7 @@ final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
return true;
if ((! (o instanceof EqualsAndHashCode2)))
return false;
final EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
if ((this.x != other.x))
return false;
return true;
@@ -65,7 +65,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
return true;
if ((! (o instanceof EqualsAndHashCode3)))
return false;
final EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
return true;
@@ -87,7 +87,7 @@ final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 exte
return true;
if ((! (o instanceof EqualsAndHashCode4)))
return false;
final EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
final @java.lang.SuppressWarnings("all") EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if ((! super.equals(o)))
test/transform/resource/after-eclipse/GetterLazyEahcToString.java
+1 -1
View File
@@ -25,7 +25,7 @@
return true;
if ((! (o instanceof GetterLazyEahcToString)))
return false;
final GetterLazyEahcToString other = (GetterLazyEahcToString) o;
final @java.lang.SuppressWarnings("all") GetterLazyEahcToString other = (GetterLazyEahcToString) o;
if ((! other.canEqual((java.lang.Object) this)))
return false;
if (((this.getValue() == null) ? (other.getValue() != null) : (! this.getValue().equals((java.lang.Object) other.getValue()))))
test/transform/resource/after-eclipse/NonNullPlain.java
+3 -8
View File
@@ -5,15 +5,12 @@ import java.lang.annotation.*;
@lombok.NonNull int i;
@lombok.NonNull String s;
@NotNull Object o;
public @java.beans.ConstructorProperties({"i", "s", "o"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s, final @NotNull Object o) {
public @java.beans.ConstructorProperties({"i", "s"}) @java.lang.SuppressWarnings("all") NonNullPlain(final @lombok.NonNull int i, final @lombok.NonNull String s) {
super();
if ((s == null))
throw new java.lang.NullPointerException("s");
if ((o == null))
throw new java.lang.NullPointerException("o");
this.i = i;
this.s = s;
this.o = o;
}
public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
return this.i;
@@ -21,7 +18,7 @@ import java.lang.annotation.*;
public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
return this.s;
}
public @NotNull @java.lang.SuppressWarnings("all") Object getO() {
public @java.lang.SuppressWarnings("all") Object getO() {
return this.o;
}
public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
@@ -32,9 +29,7 @@ import java.lang.annotation.*;
throw new java.lang.NullPointerException("s");
this.s = s;
}
public @java.lang.SuppressWarnings("all") void setO(final @NotNull Object o) {
if ((o == null))
throw new java.lang.NullPointerException("o");
public @java.lang.SuppressWarnings("all") void setO(final Object o) {
this.o = o;
}
}
test/transform/resource/after-eclipse/SynchronizedPlain.java
+2 -2
View File
@@ -1,6 +1,6 @@
import lombok.Synchronized;
class SynchronizedPlain1 {
private final @java.lang.SuppressWarnings("all") java.lang.Object $lock = new java.lang.Object[0];
private final java.lang.Object $lock = new java.lang.Object[0];
SynchronizedPlain1() {
super();
}
@@ -18,7 +18,7 @@ class SynchronizedPlain1 {
}
}
class SynchronizedPlain2 {
private static final @java.lang.SuppressWarnings("all") java.lang.Object $LOCK = new java.lang.Object[0];
private static final java.lang.Object $LOCK = new java.lang.Object[0];
<clinit>() {
}
SynchronizedPlain2() {