Added more tests, one of which tests usage of .getX() in toString, equals, and hashCode, which isn't fully working yet, so this test still fails.

9 files changed, 268 insertions, 0 deletions

diff --git a/test/transform/resource/after-delombok/DataWithGetter.java b/test/transform/resource/after-delombok/DataWithGetter.java
new file mode 100644
index 00000000..131633c3
--- /dev/null
+++ b/test/transform/resource/after-delombok/DataWithGetter.java
@@ -0,0 +1,57 @@
+class DataWithGetter {
+	private int x;
+	private int y;
+	private final String z;
+	@java.beans.ConstructorProperties({"z"})
+	@java.lang.SuppressWarnings("all")
+	public DataWithGetter(final String z) {
+		this.z = z;
+	}
+	@java.lang.SuppressWarnings("all")
+	public void setX(final int x) {
+		this.x = x;
+	}
+	@java.lang.SuppressWarnings("all")
+	public void setY(final int y) {
+		this.y = y;
+	}
+	@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;
+		if (o.getClass() != this.getClass()) return false;
+		final DataWithGetter other = (DataWithGetter)o;
+		if (this.getX() != other.getX()) return false;
+		if (this.getY() != other.getY()) return false;
+		if (this.getZ() == null ? other.getZ() != null : !this.getZ().equals(other.getZ())) return false;
+		return true;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = result * PRIME + this.getX();
+		result = result * PRIME + this.getY();
+		result = result * PRIME + (this.getZ() == null ? 0 : this.getZ().hashCode());
+		return result;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "DataWithGetterNone(x=" + this.getX() + ", y=" + this.getY() + ", z=" + this.getZ() + ")";
+	}
+	@java.lang.SuppressWarnings("all")
+	public int getX() {
+		return this.x;
+	}
+	@java.lang.SuppressWarnings("all")
+	public int getY() {
+		return this.y;
+	}
+	@java.lang.SuppressWarnings("all")
+	public String getZ() {
+		return this.z;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/DataWithGetterNone.java b/test/transform/resource/after-delombok/DataWithGetterNone.java
new file mode 100644
index 00000000..161c70f9
--- /dev/null
+++ b/test/transform/resource/after-delombok/DataWithGetterNone.java
@@ -0,0 +1,45 @@
+class DataWithGetterNone {
+	private int x;
+	private int y;
+	private final String z;
+	@java.beans.ConstructorProperties({"z"})
+	@java.lang.SuppressWarnings("all")
+	public DataWithGetterNone(final String z) {
+		this.z = z;
+	}
+	@java.lang.SuppressWarnings("all")
+	public void setX(final int x) {
+		this.x = x;
+	}
+	@java.lang.SuppressWarnings("all")
+	public void setY(final int y) {
+		this.y = y;
+	}
+	@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;
+		if (o.getClass() != this.getClass()) return false;
+		final DataWithGetterNone other = (DataWithGetterNone)o;
+		if (this.x != other.x) return false;
+		if (this.y != other.y) return false;
+		if (this.z == null ? other.z != null : !this.z.equals(other.z)) return false;
+		return true;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public int hashCode() {
+		final int PRIME = 31;
+		int result = 1;
+		result = result * PRIME + this.x;
+		result = result * PRIME + this.y;
+		result = result * PRIME + (this.z == null ? 0 : this.z.hashCode());
+		return result;
+	}
+	@java.lang.Override
+	@java.lang.SuppressWarnings("all")
+	public java.lang.String toString() {
+		return "DataWithGetterNone(x=" + this.x + ", y=" + this.y + ", z=" + this.z + ")";
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/MultiFieldGetter.java b/test/transform/resource/after-delombok/MultiFieldGetter.java
new file mode 100644
index 00000000..ed84f4ed
--- /dev/null
+++ b/test/transform/resource/after-delombok/MultiFieldGetter.java
@@ -0,0 +1,24 @@
+class MultiFieldGetter {
+	int x;
+	int y;
+	@java.lang.SuppressWarnings("all")
+	protected int getX() {
+		return this.x;
+	}
+	@java.lang.SuppressWarnings("all")
+	protected int getY() {
+		return this.y;
+	}
+}
+class MultiFieldGetter2 {
+	int x;
+	int y;
+	@java.lang.SuppressWarnings("all")
+	int getX() {
+		return this.x;
+	}
+	@java.lang.SuppressWarnings("all")
+	int getY() {
+		return this.y;
+	}
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
new file mode 100644
index 00000000..144296d2
--- /dev/null
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -0,0 +1,51 @@
+@lombok.Data @lombok.Getter class DataWithGetter {
+  private int x;
+  private int y;
+  private final String z;
+  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") DataWithGetter(final String z) {
+    super();
+    this.z = z;
+  }
+  public @java.lang.SuppressWarnings("all") void setX(final int x) {
+    this.x = x;
+  }
+  public @java.lang.SuppressWarnings("all") void setY(final int y) {
+    this.y = y;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((o == null))
+        return false;
+    if ((o.getClass() != this.getClass()))
+        return false;
+    final DataWithGetter other = (DataWithGetter) o;
+    if ((this.getX() != other.getX()))
+        return false;
+    if ((this.getY() != other.getY()))
+        return false;
+    if (((this.getZ() == null) ? (other.getZ() != null) : (! this.getZ().equals(other.getZ()))))
+        return false;
+    return true;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 31;
+    int result = 1;
+    result = ((result * PRIME) + this.getX());
+    result = ((result * PRIME) + this.getY());
+    result = ((result * PRIME) + ((this.getZ() == null) ? 0 : this.getZ().hashCode()));
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (((((("DataWithGetterNone(x=" + this.getX()) + ", y=") + this.getY()) + ", z=") + this.getZ()) + ")");
+  }
+  public @java.lang.SuppressWarnings("all") int getX() {
+    return this.x;
+  }
+  public @java.lang.SuppressWarnings("all") int getY() {
+    return this.y;
+  }
+  public @java.lang.SuppressWarnings("all") String getZ() {
+    return this.z;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
new file mode 100644
index 00000000..97509c07
--- /dev/null
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -0,0 +1,42 @@
+@lombok.Data @lombok.Getter(lombok.AccessLevel.NONE) class DataWithGetterNone {
+  private int x;
+  private int y;
+  private final String z;
+  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") DataWithGetterNone(final String z) {
+    super();
+    this.z = z;
+  }
+  public @java.lang.SuppressWarnings("all") void setX(final int x) {
+    this.x = x;
+  }
+  public @java.lang.SuppressWarnings("all") void setY(final int y) {
+    this.y = y;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
+    if ((o == this))
+        return true;
+    if ((o == null))
+        return false;
+    if ((o.getClass() != this.getClass()))
+        return false;
+    final DataWithGetterNone other = (DataWithGetterNone) o;
+    if ((this.x != other.x))
+        return false;
+    if ((this.y != other.y))
+        return false;
+    if (((this.z == null) ? (other.z != null) : (! this.z.equals(other.z))))
+        return false;
+    return true;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
+    final int PRIME = 31;
+    int result = 1;
+    result = ((result * PRIME) + this.x);
+    result = ((result * PRIME) + this.y);
+    result = ((result * PRIME) + ((this.z == null) ? 0 : this.z.hashCode()));
+    return result;
+  }
+  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
+    return (((((("DataWithGetterNone(x=" + this.x) + ", y=") + this.y) + ", z=") + this.z) + ")");
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/MultiFieldGetter.java b/test/transform/resource/after-ecj/MultiFieldGetter.java
new file mode 100644
index 00000000..4ed6038d
--- /dev/null
+++ b/test/transform/resource/after-ecj/MultiFieldGetter.java
@@ -0,0 +1,28 @@
+import lombok.Getter;
+import lombok.AccessLevel;
+class MultiFieldGetter {
+  @Getter(AccessLevel.PROTECTED) int x;
+  @Getter(AccessLevel.PROTECTED) int y;
+  MultiFieldGetter() {
+    super();
+  }
+  protected @java.lang.SuppressWarnings("all") int getX() {
+    return this.x;
+  }
+  protected @java.lang.SuppressWarnings("all") int getY() {
+    return this.y;
+  }
+}
+@Getter class MultiFieldGetter2 {
+  @Getter(AccessLevel.PACKAGE) int x;
+  @Getter(AccessLevel.PACKAGE) int y;
+  MultiFieldGetter2() {
+    super();
+  }
+  @java.lang.SuppressWarnings("all") int getX() {
+    return this.x;
+  }
+  @java.lang.SuppressWarnings("all") int getY() {
+    return this.y;
+  }
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/DataWithGetter.java b/test/transform/resource/before/DataWithGetter.java
new file mode 100644
index 00000000..74695c42
--- /dev/null
+++ b/test/transform/resource/before/DataWithGetter.java
@@ -0,0 +1,5 @@
+@lombok.Data @lombok.Getter
+class DataWithGetter {
+	private int x, y;
+	private final String z;
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/DataWithGetterNone.java b/test/transform/resource/before/DataWithGetterNone.java
new file mode 100644
index 00000000..bf28067c
--- /dev/null
+++ b/test/transform/resource/before/DataWithGetterNone.java
@@ -0,0 +1,5 @@
+@lombok.Data @lombok.Getter(lombok.AccessLevel.NONE)
+class DataWithGetterNone {
+	private int x, y;
+	private final String z;
+}
\ No newline at end of file
diff --git a/test/transform/resource/before/MultiFieldGetter.java b/test/transform/resource/before/MultiFieldGetter.java
new file mode 100644
index 00000000..20a3782f
--- /dev/null
+++ b/test/transform/resource/before/MultiFieldGetter.java
@@ -0,0 +1,11 @@
+import lombok.Getter;
+import lombok.AccessLevel;
+
+class MultiFieldGetter {
+	@Getter(AccessLevel.PROTECTED) int x, y;
+}
+
+@Getter
+class MultiFieldGetter2 {
+	@Getter(AccessLevel.PACKAGE) int x, y;
+}
\ No newline at end of file