ecj tests and eclipse tests are now effectively doing the same thing, except the ecj tests are written in a slightly more close-to-reality way, and do work for 'val'. eclipse test aspect removed.

82 files changed, 7 insertions, 2490 deletions

diff --git a/test/transform/resource/after-eclipse/ClassNamedAfterGetter.java b/test/transform/resource/after-eclipse/ClassNamedAfterGetter.java
deleted file mode 100644
index fb9df0ea..00000000
--- a/test/transform/resource/after-eclipse/ClassNamedAfterGetter.java
+++ /dev/null
@@ -1,9 +0,0 @@
-class GetFoo {
-  private @lombok.Getter int foo;
-  public @java.lang.SuppressWarnings("all") int getFoo() {
-    return this.foo;
-  }
-  GetFoo() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/CleanupName.java b/test/transform/resource/after-eclipse/CleanupName.java
deleted file mode 100644
index f3f725f2..00000000
--- a/test/transform/resource/after-eclipse/CleanupName.java
+++ /dev/null
@@ -1,33 +0,0 @@
-class CleanupName {
-  CleanupName() {
-    super();
-  }
-  void test() {
-    @lombok.Cleanup("toString") Object o = "Hello World!";
-    try 
-      {
-        System.out.println(o);
-      }
-    finally
-      {
-        if ((java.util.Collections.singletonList(o).get(0) != null))
-            {
-              o.toString();
-            }
-      }
-  }
-  void test2() {
-    @lombok.Cleanup(value = "toString") Object o = "Hello World too!";
-    try 
-      {
-        System.out.println(o);
-      }
-    finally
-      {
-        if ((java.util.Collections.singletonList(o).get(0) != null))
-            {
-              o.toString();
-            }
-      }
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/CleanupPlain.java b/test/transform/resource/after-eclipse/CleanupPlain.java
deleted file mode 100644
index a9b9eceb..00000000
--- a/test/transform/resource/after-eclipse/CleanupPlain.java
+++ /dev/null
@@ -1,35 +0,0 @@
-import lombok.Cleanup;
-import java.io.*;
-class CleanupPlain {
-  CleanupPlain() {
-    super();
-  }
-  void test() throws Exception {
-    @lombok.Cleanup InputStream in = new FileInputStream("in");
-    try 
-      {
-        @Cleanup OutputStream out = new FileOutputStream("out");
-        try 
-          {
-            if (in.markSupported())
-                {
-                  out.flush();
-                }
-          }
-        finally
-          {
-            if ((java.util.Collections.singletonList(out).get(0) != null))
-                {
-                  out.close();
-                }
-          }
-      }
-    finally
-      {
-        if ((java.util.Collections.singletonList(in).get(0) != null))
-            {
-              in.close();
-            }
-      }
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/CommentsInterspersed.java b/test/transform/resource/after-eclipse/CommentsInterspersed.java
deleted file mode 100644
index 60c69aed..00000000
--- a/test/transform/resource/after-eclipse/CommentsInterspersed.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import lombok.Getter;
-public class CommentsInterspersed {
-  private int x;
-  private @Getter String test = "foo";
-  public @java.lang.SuppressWarnings("all") String getTest() {
-    return this.test;
-  }
-  public CommentsInterspersed() {
-    super();
-  }
-  public native void gwtTest();
-}
diff --git a/test/transform/resource/after-eclipse/Constructors.java b/test/transform/resource/after-eclipse/Constructors.java
deleted file mode 100644
index e47ec8b5..00000000
--- a/test/transform/resource/after-eclipse/Constructors.java
+++ /dev/null
@@ -1,43 +0,0 @@
-@lombok.RequiredArgsConstructor class RequiredArgsConstructor1 {
-  final int x;
-  String name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") RequiredArgsConstructor1(final int x) {
-    super();
-    this.x = x;
-  }
-}
-@lombok.RequiredArgsConstructor(access = lombok.AccessLevel.PROTECTED) class RequiredArgsConstructorAccess {
-  final int x;
-  String name;
-  protected @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") RequiredArgsConstructorAccess(final int x) {
-    super();
-    this.x = x;
-  }
-}
-@lombok.RequiredArgsConstructor(staticName = "staticname") class RequiredArgsConstructorStaticName {
-  final int x;
-  String name;
-  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName(final int x) {
-    super();
-    this.x = x;
-  }
-  public static @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticName staticname(final int x) {
-    return new RequiredArgsConstructorStaticName(x);
-  }
-}
-@lombok.AllArgsConstructor class AllArgsConstructor1 {
-  final int x;
-  String name;
-  public @java.beans.ConstructorProperties({"x", "name"}) @java.lang.SuppressWarnings("all") AllArgsConstructor1(final int x, final String name) {
-    super();
-    this.x = x;
-    this.name = name;
-  }
-}
-@lombok.NoArgsConstructor class NoArgsConstructor1 {
-  final int x;
-  String name;
-  public @java.lang.SuppressWarnings("all") NoArgsConstructor1() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DataExtended.java b/test/transform/resource/after-eclipse/DataExtended.java
deleted file mode 100644
index dfc64f2d..00000000
--- a/test/transform/resource/after-eclipse/DataExtended.java
+++ /dev/null
@@ -1,36 +0,0 @@
-@lombok.Data @lombok.ToString(doNotUseGetters = true) class DataExtended {
-  int x;
-  public @java.lang.SuppressWarnings("all") DataExtended() {
-    super();
-  }
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  public @java.lang.SuppressWarnings("all") void setX(final int x) {
-    this.x = x;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof DataExtended)))
-        return false;
-    final @java.lang.SuppressWarnings("all") DataExtended other = (DataExtended) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.getX() != other.getX()))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof DataExtended);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 31;
-    int result = 1;
-    result = ((result * PRIME) + this.getX());
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("DataExtended(x=" + this.x) + ")");
-  }
-}
diff --git a/test/transform/resource/after-eclipse/DataIgnore.java b/test/transform/resource/after-eclipse/DataIgnore.java
deleted file mode 100644
index 109bf1d6..00000000
--- a/test/transform/resource/after-eclipse/DataIgnore.java
+++ /dev/null
@@ -1,35 +0,0 @@
-@lombok.Data class DataIgnore {
-  final int x;
-  String $name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") DataIgnore(final int x) {
-    super();
-    this.x = x;
-  }
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof DataIgnore)))
-        return false;
-    final @java.lang.SuppressWarnings("all") DataIgnore other = (DataIgnore) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.getX() != other.getX()))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof DataIgnore);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 31;
-    int result = 1;
-    result = ((result * PRIME) + this.getX());
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("DataIgnore(x=" + this.getX()) + ")");
-  }
-}
diff --git a/test/transform/resource/after-eclipse/DataOnEnum.java b/test/transform/resource/after-eclipse/DataOnEnum.java
deleted file mode 100644
index 8bab5925..00000000
--- a/test/transform/resource/after-eclipse/DataOnEnum.java
+++ /dev/null
@@ -1,16 +0,0 @@
-public @lombok.Getter @lombok.ToString @lombok.RequiredArgsConstructor enum DataOnEnum {
-  A("hello"),
-  private final String someField;
-  <clinit>() {
-  }
-  private @java.lang.SuppressWarnings("all") DataOnEnum(final String someField) {
-    super();
-    this.someField = someField;
-  }
-  public @java.lang.SuppressWarnings("all") String getSomeField() {
-    return this.someField;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("DataOnEnum(someField=" + this.getSomeField()) + ")");
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DataOnLocalClass.java b/test/transform/resource/after-eclipse/DataOnLocalClass.java
deleted file mode 100644
index 44ae0ddc..00000000
--- a/test/transform/resource/after-eclipse/DataOnLocalClass.java
+++ /dev/null
@@ -1,134 +0,0 @@
-import lombok.Data;
-class DataOnLocalClass1 {
-  DataOnLocalClass1() {
-    super();
-  }
-  public static void main(String[] args) {
-    @Data class Local {
-      final int x;
-      String name;
-      public @java.lang.SuppressWarnings("all") Local(final int x) {
-        super();
-        this.x = x;
-      }
-      public @java.lang.SuppressWarnings("all") int getX() {
-        return this.x;
-      }
-      public @java.lang.SuppressWarnings("all") String getName() {
-        return this.name;
-      }
-      public @java.lang.SuppressWarnings("all") void setName(final String name) {
-        this.name = name;
-      }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-        if ((o == this))
-            return true;
-        if ((! (o instanceof Local)))
-            return false;
-        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
-        if ((! other.canEqual((java.lang.Object) this)))
-            return false;
-        if ((this.getX() != other.getX()))
-            return false;
-        if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
-            return false;
-        return true;
-      }
-      public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-        return (other instanceof Local);
-      }
-      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.getName() == null) ? 0 : this.getName().hashCode()));
-        return result;
-      }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-        return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")");
-      }
-    }
-  }
-}
-class DataOnLocalClass2 {
-  {
-    @Data class Local {
-      @Data class InnerLocal {
-        @lombok.NonNull String name;
-        public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) {
-          super();
-          if ((name == null))
-              throw new java.lang.NullPointerException("name");
-          this.name = name;
-        }
-        public @lombok.NonNull @java.lang.SuppressWarnings("all") String getName() {
-          return this.name;
-        }
-        public @java.lang.SuppressWarnings("all") void setName(final @lombok.NonNull String name) {
-          if ((name == null))
-              throw new java.lang.NullPointerException("name");
-          this.name = name;
-        }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-          if ((o == this))
-              return true;
-          if ((! (o instanceof Local.InnerLocal)))
-              return false;
-          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()))))
-              return false;
-          return true;
-        }
-        public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-          return (other instanceof Local.InnerLocal);
-        }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-          final int PRIME = 31;
-          int result = 1;
-          result = ((result * PRIME) + ((this.getName() == null) ? 0 : this.getName().hashCode()));
-          return result;
-        }
-        public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-          return (("Local.InnerLocal(name=" + this.getName()) + ")");
-        }
-      }
-      final int x;
-      public @java.lang.SuppressWarnings("all") Local(final int x) {
-        super();
-        this.x = x;
-      }
-      public @java.lang.SuppressWarnings("all") int getX() {
-        return this.x;
-      }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-        if ((o == this))
-            return true;
-        if ((! (o instanceof Local)))
-            return false;
-        final @java.lang.SuppressWarnings("all") Local other = (Local) o;
-        if ((! other.canEqual((java.lang.Object) this)))
-            return false;
-        if ((this.getX() != other.getX()))
-            return false;
-        return true;
-      }
-      public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-        return (other instanceof Local);
-      }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = ((result * PRIME) + this.getX());
-        return result;
-      }
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-        return (("Local(x=" + this.getX()) + ")");
-      }
-    }
-  }
-  DataOnLocalClass2() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DataPlain.java b/test/transform/resource/after-eclipse/DataPlain.java
deleted file mode 100644
index 0c4a6ab0..00000000
--- a/test/transform/resource/after-eclipse/DataPlain.java
+++ /dev/null
@@ -1,208 +0,0 @@
-import lombok.Data;
-@lombok.Data class Data1 {
-  final int x;
-  String name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data1(final int x) {
-    super();
-    this.x = x;
-  }
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  public @java.lang.SuppressWarnings("all") String getName() {
-    return this.name;
-  }
-  public @java.lang.SuppressWarnings("all") void setName(final String name) {
-    this.name = name;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof Data1)))
-        return false;
-    final @java.lang.SuppressWarnings("all") Data1 other = (Data1) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.getX() != other.getX()))
-        return false;
-    if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof Data1);
-  }
-  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.getName() == null) ? 0 : this.getName().hashCode()));
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")");
-  }
-}
-@Data class Data2 {
-  final int x;
-  String name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data2(final int x) {
-    super();
-    this.x = x;
-  }
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  public @java.lang.SuppressWarnings("all") String getName() {
-    return this.name;
-  }
-  public @java.lang.SuppressWarnings("all") void setName(final String name) {
-    this.name = name;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof Data2)))
-        return false;
-    final @java.lang.SuppressWarnings("all") Data2 other = (Data2) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.getX() != other.getX()))
-        return false;
-    if (((this.getName() == null) ? (other.getName() != null) : (! this.getName().equals((java.lang.Object) other.getName()))))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof Data2);
-  }
-  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.getName() == null) ? 0 : this.getName().hashCode()));
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
-  }
-}
-final @Data class Data3 {
-  final int x;
-  String name;
-  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data3(final int x) {
-    super();
-    this.x = x;
-  }
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  public @java.lang.SuppressWarnings("all") String getName() {
-    return this.name;
-  }
-  public @java.lang.SuppressWarnings("all") void setName(final String name) {
-    this.name = name;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof Data3)))
-        return false;
-    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()))))
-        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.getName() == null) ? 0 : this.getName().hashCode()));
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")");
-  }
-}
-final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java.util.Timer {
-  final int x;
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (("Data4(x=" + this.getX()) + ")");
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof Data4)))
-        return false;
-    final @java.lang.SuppressWarnings("all") Data4 other = (Data4) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((! super.equals(o)))
-        return false;
-    if ((this.getX() != other.getX()))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof Data4);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 31;
-    int result = 1;
-    result = ((result * PRIME) + super.hashCode());
-    result = ((result * PRIME) + this.getX());
-    return result;
-  }
-  Data4() {
-    super();
-  }
-}
-@Data class Data5 {
-  public @java.lang.SuppressWarnings("all") Data5() {
-    super();
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof Data5)))
-        return false;
-    final @java.lang.SuppressWarnings("all") Data5 other = (Data5) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof Data5);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    int result = 1;
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return "Data5()";
-  }
-}
-final @Data class Data6 {
-  public @java.lang.SuppressWarnings("all") Data6() {
-    super();
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof Data6)))
-        return false;
-    return true;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    int result = 1;
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return "Data6()";
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DataWithGetter.java b/test/transform/resource/after-eclipse/DataWithGetter.java
deleted file mode 100644
index 80e11be4..00000000
--- a/test/transform/resource/after-eclipse/DataWithGetter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-@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 instanceof DataWithGetter)))
-        return false;
-    final @java.lang.SuppressWarnings("all") DataWithGetter other = (DataWithGetter) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.getX() != other.getX()))
-        return false;
-    if ((this.getY() != other.getY()))
-        return false;
-    if (((this.getZ() == null) ? (other.getZ() != null) : (! this.getZ().equals((java.lang.Object) other.getZ()))))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof DataWithGetter);
-  }
-  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 (((((("DataWithGetter(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-eclipse/DataWithGetterNone.java b/test/transform/resource/after-eclipse/DataWithGetterNone.java
deleted file mode 100644
index a31ebece..00000000
--- a/test/transform/resource/after-eclipse/DataWithGetterNone.java
+++ /dev/null
@@ -1,45 +0,0 @@
-@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 instanceof DataWithGetterNone)))
-        return false;
-    final @java.lang.SuppressWarnings("all") DataWithGetterNone other = (DataWithGetterNone) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.x != other.x))
-        return false;
-    if ((this.y != other.y))
-        return false;
-    if (((this.z == null) ? (other.z != null) : (! this.z.equals((java.lang.Object) other.z))))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof DataWithGetterNone);
-  }
-  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-eclipse/DelegateOnGetter.java b/test/transform/resource/after-eclipse/DelegateOnGetter.java
deleted file mode 100644
index 7d5907e0..00000000
--- a/test/transform/resource/after-eclipse/DelegateOnGetter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-import lombok.Delegate;
-import lombok.Getter;
-class DelegateOnGetter {
-  private interface Bar {
-    void setList(java.util.ArrayList<java.lang.String> list);
-    int getInt();
-  }
-  private final @Delegate @Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<Bar>> bar = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<Bar>>();
-  public @Delegate @java.lang.SuppressWarnings("all") Bar getBar() {
-    java.util.concurrent.atomic.AtomicReference<Bar> value = this.bar.get();
-    if ((value == null))
-        {
-          synchronized (this.bar)
-            {
-              value = this.bar.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<Bar>(new Bar() {
-  public void setList(java.util.ArrayList<String> list) {
-  }
-  public int getInt() {
-    return 42;
-  }
-});
-                    this.bar.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") int getInt() {
-    return this.getBar().getInt();
-  }
-  public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList<java.lang.String> list) {
-    this.getBar().setList(list);
-  }
-  DelegateOnGetter() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DelegateOnGetterNone.java b/test/transform/resource/after-eclipse/DelegateOnGetterNone.java
deleted file mode 100644
index 195797a8..00000000
--- a/test/transform/resource/after-eclipse/DelegateOnGetterNone.java
+++ /dev/null
@@ -1,19 +0,0 @@
-import lombok.AccessLevel;
-import lombok.Delegate;
-import lombok.Getter;
-@Getter class DelegateOnGetterNone {
-  private interface Bar {
-    void setList(java.util.ArrayList<java.lang.String> list);
-    int getInt();
-  }
-  private final @Delegate @Getter(AccessLevel.NONE) Bar bar;
-  public @java.lang.SuppressWarnings("all") int getInt() {
-    return this.bar.getInt();
-  }
-  public @java.lang.SuppressWarnings("all") void setList(final java.util.ArrayList<java.lang.String> list) {
-    this.bar.setList(list);
-  }
-  DelegateOnGetterNone() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DelegateOnMethods.java b/test/transform/resource/after-eclipse/DelegateOnMethods.java
deleted file mode 100644
index 37922e2a..00000000
--- a/test/transform/resource/after-eclipse/DelegateOnMethods.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import lombok.Delegate;
-abstract class DelegateOnMethods {
-  public static interface Bar {
-    void bar(java.util.ArrayList<java.lang.String> list);
-  }
-  public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList<java.lang.String> list) {
-    this.getBar().bar(list);
-  }
-  DelegateOnMethods() {
-    super();
-  }
-  public abstract @Delegate Bar getBar();
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/DelegateTypesAndExcludes.java b/test/transform/resource/after-eclipse/DelegateTypesAndExcludes.java
deleted file mode 100644
index 821c0851..00000000
--- a/test/transform/resource/after-eclipse/DelegateTypesAndExcludes.java
+++ /dev/null
@@ -1,36 +0,0 @@
-import lombok.Delegate;
-class DelegatePlain {
-  private static class FooImpl implements Foo {
-    private FooImpl() {
-      super();
-    }
-    public void foo() {
-    }
-    public void bar(java.util.ArrayList<java.lang.String> list) {
-    }
-  }
-  private static class BarImpl implements Bar {
-    private BarImpl() {
-      super();
-    }
-    public void bar(java.util.ArrayList<java.lang.String> list) {
-    }
-  }
-  private static interface Foo extends Bar {
-    void foo();
-  }
-  private static interface Bar {
-    void bar(java.util.ArrayList<java.lang.String> list);
-  }
-  private final @Delegate(types = Bar.class) BarImpl bar = new BarImpl();
-  private final @Delegate(types = Foo.class,excludes = Bar.class) FooImpl foo = new FooImpl();
-  public @java.lang.SuppressWarnings("all") void bar(final java.util.ArrayList<java.lang.String> list) {
-    this.bar.bar(list);
-  }
-  public @java.lang.SuppressWarnings("all") void foo() {
-    this.foo.foo();
-  }
-  DelegatePlain() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/EqualsAndHashCode.java b/test/transform/resource/after-eclipse/EqualsAndHashCode.java
deleted file mode 100644
index eeda5867..00000000
--- a/test/transform/resource/after-eclipse/EqualsAndHashCode.java
+++ /dev/null
@@ -1,109 +0,0 @@
-@lombok.EqualsAndHashCode class EqualsAndHashCode {
-  int x;
-  boolean[] y;
-  Object[] z;
-  String a;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof EqualsAndHashCode)))
-        return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode other = (EqualsAndHashCode) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((this.x != other.x))
-        return false;
-    if ((! java.util.Arrays.equals(this.y, other.y)))
-        return false;
-    if ((! java.util.Arrays.deepEquals(this.z, other.z)))
-        return false;
-    if (((this.a == null) ? (other.a != null) : (! this.a.equals((java.lang.Object) other.a))))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof EqualsAndHashCode);
-  }
-  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) + java.util.Arrays.hashCode(this.y));
-    result = ((result * PRIME) + java.util.Arrays.deepHashCode(this.z));
-    result = ((result * PRIME) + ((this.a == null) ? 0 : this.a.hashCode()));
-    return result;
-  }
-  EqualsAndHashCode() {
-    super();
-  }
-}
-final @lombok.EqualsAndHashCode class EqualsAndHashCode2 {
-  int x;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof EqualsAndHashCode2)))
-        return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode2 other = (EqualsAndHashCode2) o;
-    if ((this.x != other.x))
-        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);
-    return result;
-  }
-  EqualsAndHashCode2() {
-    super();
-  }
-}
-final @lombok.EqualsAndHashCode(callSuper = false) class EqualsAndHashCode3 extends EqualsAndHashCode {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof EqualsAndHashCode3)))
-        return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode3 other = (EqualsAndHashCode3) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof EqualsAndHashCode3);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    int result = 1;
-    return result;
-  }
-  EqualsAndHashCode3() {
-    super();
-  }
-}
-@lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCode4 extends EqualsAndHashCode {
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof EqualsAndHashCode4)))
-        return false;
-    final @java.lang.SuppressWarnings("all") EqualsAndHashCode4 other = (EqualsAndHashCode4) o;
-    if ((! other.canEqual((java.lang.Object) this)))
-        return false;
-    if ((! super.equals(o)))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof EqualsAndHashCode4);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 31;
-    int result = 1;
-    result = ((result * PRIME) + super.hashCode());
-    return result;
-  }
-  EqualsAndHashCode4() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/EqualsAndHashCodeWithExistingMethods.java b/test/transform/resource/after-eclipse/EqualsAndHashCodeWithExistingMethods.java
deleted file mode 100644
index 50b219f1..00000000
--- a/test/transform/resource/after-eclipse/EqualsAndHashCodeWithExistingMethods.java
+++ /dev/null
@@ -1,27 +0,0 @@
-@lombok.EqualsAndHashCode class EqualsAndHashCodeWithExistingMethods {
-  int x;
-  EqualsAndHashCodeWithExistingMethods() {
-    super();
-  }
-  public int hashCode() {
-    return 42;
-  }
-}
-final @lombok.EqualsAndHashCode class EqualsAndHashCodeWithExistingMethods2 {
-  int x;
-  EqualsAndHashCodeWithExistingMethods2() {
-    super();
-  }
-  public boolean equals(Object other) {
-    return false;
-  }
-}
-final @lombok.EqualsAndHashCode(callSuper = true) class EqualsAndHashCodeWithExistingMethods3 extends EqualsAndHashCodeWithExistingMethods {
-  int x;
-  EqualsAndHashCodeWithExistingMethods3() {
-    super();
-  }
-  public boolean canEqual(Object other) {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterAccessLevel.java b/test/transform/resource/after-eclipse/GetterAccessLevel.java
deleted file mode 100644
index f0de95e7..00000000
--- a/test/transform/resource/after-eclipse/GetterAccessLevel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-class GetterAccessLevel {
-  @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
-  @lombok.Getter(lombok.AccessLevel.PRIVATE) boolean isPrivate;
-  @lombok.Getter(lombok.AccessLevel.PACKAGE) boolean isPackage;
-  @lombok.Getter(lombok.AccessLevel.PROTECTED) boolean isProtected;
-  @lombok.Getter(lombok.AccessLevel.PUBLIC) boolean isPublic;
-  @lombok.Getter(lombok.AccessLevel.NONE) String noneString;
-  @lombok.Getter(lombok.AccessLevel.PRIVATE) String privateString;
-  @lombok.Getter(lombok.AccessLevel.PACKAGE) String packageString;
-  @lombok.Getter(lombok.AccessLevel.PROTECTED) String protectedString;
-  @lombok.Getter(lombok.AccessLevel.PUBLIC) String publicString;
-  @lombok.Getter(value = lombok.AccessLevel.PUBLIC) String value;
-  private @java.lang.SuppressWarnings("all") boolean isPrivate() {
-    return this.isPrivate;
-  }
-  @java.lang.SuppressWarnings("all") boolean isPackage() {
-    return this.isPackage;
-  }
-  protected @java.lang.SuppressWarnings("all") boolean isProtected() {
-    return this.isProtected;
-  }
-  public @java.lang.SuppressWarnings("all") boolean isPublic() {
-    return this.isPublic;
-  }
-  private @java.lang.SuppressWarnings("all") String getPrivateString() {
-    return this.privateString;
-  }
-  @java.lang.SuppressWarnings("all") String getPackageString() {
-    return this.packageString;
-  }
-  protected @java.lang.SuppressWarnings("all") String getProtectedString() {
-    return this.protectedString;
-  }
-  public @java.lang.SuppressWarnings("all") String getPublicString() {
-    return this.publicString;
-  }
-  public @java.lang.SuppressWarnings("all") String getValue() {
-    return this.value;
-  }
-  GetterAccessLevel() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/GetterAlreadyExists.java b/test/transform/resource/after-eclipse/GetterAlreadyExists.java
deleted file mode 100644
index d5bb7e60..00000000
--- a/test/transform/resource/after-eclipse/GetterAlreadyExists.java
+++ /dev/null
@@ -1,192 +0,0 @@
-class Getter1 {
-  @lombok.Getter boolean foo;
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
-    return this.foo;
-  }
-  Getter1() {
-    super();
-  }
-  boolean hasFoo() {
-    return true;
-  }
-}
-class Getter2 {
-  @lombok.Getter boolean foo;
-  Getter2() {
-    super();
-  }
-  boolean isFoo() {
-    return true;
-  }
-}
-class Getter3 {
-  @lombok.Getter boolean foo;
-  Getter3() {
-    super();
-  }
-  boolean getFoo() {
-    return true;
-  }
-}
-class Getter4 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter4() {
-    super();
-  }
-  String hasFoo() {
-    return null;
-  }
-}
-class Getter5 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter5() {
-    super();
-  }
-  String isFoo() {
-    return null;
-  }
-}
-class Getter6 {
-  @lombok.Getter String foo;
-  Getter6() {
-    super();
-  }
-  String getFoo() {
-    return null;
-  }
-}
-class Getter7 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter7() {
-    super();
-  }
-  boolean hasFoo() {
-    return false;
-  }
-}
-class Getter8 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter8() {
-    super();
-  }
-  boolean isFoo() {
-    return false;
-  }
-}
-class Getter9 {
-  @lombok.Getter String foo;
-  Getter9() {
-    super();
-  }
-  boolean getFoo() {
-    return false;
-  }
-}
-class Getter10 {
-  @lombok.Getter boolean foo;
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
-    return this.foo;
-  }
-  Getter10() {
-    super();
-  }
-  static boolean hasFoo() {
-    return false;
-  }
-}
-class Getter11 {
-  @lombok.Getter boolean foo;
-  Getter11() {
-    super();
-  }
-  static boolean isFoo() {
-    return false;
-  }
-}
-class Getter12 {
-  @lombok.Getter boolean foo;
-  Getter12() {
-    super();
-  }
-  static boolean getFoo() {
-    return false;
-  }
-}
-class Getter13 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter13() {
-    super();
-  }
-  static boolean hasFoo() {
-    return false;
-  }
-}
-class Getter14 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter14() {
-    super();
-  }
-  static boolean isFoo() {
-    return false;
-  }
-}
-class Getter15 {
-  @lombok.Getter String foo;
-  Getter15() {
-    super();
-  }
-  static boolean getFoo() {
-    return false;
-  }
-}
-class Getter16 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter16() {
-    super();
-  }
-  static String hasFoo() {
-    return "";
-  }
-}
-class Getter17 {
-  @lombok.Getter String foo;
-  public @java.lang.SuppressWarnings("all") String getFoo() {
-    return this.foo;
-  }
-  Getter17() {
-    super();
-  }
-  static String isFoo() {
-    return "";
-  }
-}
-class Getter18 {
-  @lombok.Getter String foo;
-  Getter18() {
-    super();
-  }
-  static String getFoo() {
-    return "";
-  }
-}
diff --git a/test/transform/resource/after-eclipse/GetterBoolean.java b/test/transform/resource/after-eclipse/GetterBoolean.java
deleted file mode 100644
index 121af119..00000000
--- a/test/transform/resource/after-eclipse/GetterBoolean.java
+++ /dev/null
@@ -1,38 +0,0 @@
-class Getter {
-  @lombok.Getter boolean foo;
-  @lombok.Getter boolean isBar;
-  @lombok.Getter boolean hasBaz;
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
-    return this.foo;
-  }
-  public @java.lang.SuppressWarnings("all") boolean isBar() {
-    return this.isBar;
-  }
-  public @java.lang.SuppressWarnings("all") boolean isHasBaz() {
-    return this.hasBaz;
-  }
-  Getter() {
-    super();
-  }
-}
-class MoreGetter {
-  @lombok.Getter boolean foo;
-  public @java.lang.SuppressWarnings("all") boolean isFoo() {
-    return this.foo;
-  }
-  MoreGetter() {
-    super();
-  }
-  boolean hasFoo() {
-    return true;
-  }
-}
-class YetMoreGetter {
-  @lombok.Getter boolean foo;
-  YetMoreGetter() {
-    super();
-  }
-  boolean getFoo() {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterLazy.java b/test/transform/resource/after-eclipse/GetterLazy.java
deleted file mode 100644
index 669a9a81..00000000
--- a/test/transform/resource/after-eclipse/GetterLazy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-class GetterLazy {
-  static class ValueType {
-    ValueType() {
-      super();
-    }
-  }
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<ValueType>> fieldName = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<ValueType>>();
-  public @java.lang.SuppressWarnings("all") ValueType getFieldName() {
-    java.util.concurrent.atomic.AtomicReference<ValueType> value = this.fieldName.get();
-    if ((value == null))
-        {
-          synchronized (this.fieldName)
-            {
-              value = this.fieldName.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<ValueType>(new ValueType());
-                    this.fieldName.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  GetterLazy() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/GetterLazyEahcToString.java b/test/transform/resource/after-eclipse/GetterLazyEahcToString.java
deleted file mode 100644
index 4876bd67..00000000
--- a/test/transform/resource/after-eclipse/GetterLazyEahcToString.java
+++ /dev/null
@@ -1,53 +0,0 @@
-@lombok.EqualsAndHashCode(doNotUseGetters = true) @lombok.ToString(doNotUseGetters = true) class GetterLazyEahcToString {
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<String>> value = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<String>>();
-  private final @lombok.Getter String value2 = "";
-  public @java.lang.SuppressWarnings("all") String getValue() {
-    java.util.concurrent.atomic.AtomicReference<String> value = this.value.get();
-    if ((value == null))
-        {
-          synchronized (this.value)
-            {
-              value = this.value.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<String>("");
-                    this.value.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") String getValue2() {
-    return this.value2;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
-    if ((o == this))
-        return true;
-    if ((! (o instanceof GetterLazyEahcToString)))
-        return false;
-    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()))))
-        return false;
-    if (((this.value2 == null) ? (other.value2 != null) : (! this.value2.equals((java.lang.Object) other.value2))))
-        return false;
-    return true;
-  }
-  public @java.lang.SuppressWarnings("all") boolean canEqual(final java.lang.Object other) {
-    return (other instanceof GetterLazyEahcToString);
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") int hashCode() {
-    final int PRIME = 31;
-    int result = 1;
-    result = ((result * PRIME) + ((this.getValue() == null) ? 0 : this.getValue().hashCode()));
-    result = ((result * PRIME) + ((this.value2 == null) ? 0 : this.value2.hashCode()));
-    return result;
-  }
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("GetterLazyEahcToString(value=" + this.getValue()) + ", value2=") + this.value2) + ")");
-  }
-  GetterLazyEahcToString() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterLazyInvalid.java b/test/transform/resource/after-eclipse/GetterLazyInvalid.java
deleted file mode 100644
index eaa22d71..00000000
--- a/test/transform/resource/after-eclipse/GetterLazyInvalid.java
+++ /dev/null
@@ -1,40 +0,0 @@
-class GetterLazyInvalidNotFinal {
-  private @lombok.Getter(lazy = true) String fieldName = "";
-  GetterLazyInvalidNotFinal() {
-    super();
-  }
-}
-class GetterLazyInvalidNotPrivate {
-  final @lombok.Getter(lazy = true) String fieldName = "";
-  GetterLazyInvalidNotPrivate() {
-    super();
-  }
-}
-class GetterLazyInvalidNotPrivateFinal {
-  @lombok.Getter(lazy = true) String fieldName = "";
-  GetterLazyInvalidNotPrivateFinal() {
-    super();
-  }
-}
-class GetterLazyInvalidNone {
-  private final @lombok.Getter(lazy = true,value = lombok.AccessLevel.NONE) String fieldName = "";
-  GetterLazyInvalidNone() {
-    super();
-  }
-}
-@lombok.Getter(lazy = true) class GetterLazyInvalidClass {
-  private final String fieldName = "";
-  public @java.lang.SuppressWarnings("all") String getFieldName() {
-    return this.fieldName;
-  }
-  GetterLazyInvalidClass() {
-    super();
-  }
-}
-class GetterLazyInvalidNoInit {
-  private final @lombok.Getter(lazy = true) String fieldName;
-  GetterLazyInvalidNoInit() {
-    super();
-    this.fieldName = "foo";
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterLazyNative.java b/test/transform/resource/after-eclipse/GetterLazyNative.java
deleted file mode 100644
index 6c90a101..00000000
--- a/test/transform/resource/after-eclipse/GetterLazyNative.java
+++ /dev/null
@@ -1,158 +0,0 @@
-class GetterLazyNative {
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>> booleanField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Byte>> byteField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Byte>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Short>> shortField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Short>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Integer>> intField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Integer>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Long>> longField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Long>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Float>> floatField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Float>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Double>> doubleField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Double>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Character>> charField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<java.lang.Character>>();
-  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<int[]>> intArrayField = new java.util.concurrent.atomic.AtomicReference<java.util.concurrent.atomic.AtomicReference<int[]>>();
-  public @java.lang.SuppressWarnings("all") boolean isBooleanField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Boolean> value = this.booleanField.get();
-    if ((value == null))
-        {
-          synchronized (this.booleanField)
-            {
-              value = this.booleanField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Boolean>(true);
-                    this.booleanField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") byte getByteField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Byte> value = this.byteField.get();
-    if ((value == null))
-        {
-          synchronized (this.byteField)
-            {
-              value = this.byteField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Byte>(1);
-                    this.byteField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") short getShortField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Short> value = this.shortField.get();
-    if ((value == null))
-        {
-          synchronized (this.shortField)
-            {
-              value = this.shortField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Short>(1);
-                    this.shortField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") int getIntField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Integer> value = this.intField.get();
-    if ((value == null))
-        {
-          synchronized (this.intField)
-            {
-              value = this.intField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Integer>(1);
-                    this.intField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") long getLongField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Long> value = this.longField.get();
-    if ((value == null))
-        {
-          synchronized (this.longField)
-            {
-              value = this.longField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Long>(1);
-                    this.longField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") float getFloatField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Float> value = this.floatField.get();
-    if ((value == null))
-        {
-          synchronized (this.floatField)
-            {
-              value = this.floatField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Float>(1.0f);
-                    this.floatField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") double getDoubleField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Double> value = this.doubleField.get();
-    if ((value == null))
-        {
-          synchronized (this.doubleField)
-            {
-              value = this.doubleField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Double>(1.0);
-                    this.doubleField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") char getCharField() {
-    java.util.concurrent.atomic.AtomicReference<java.lang.Character> value = this.charField.get();
-    if ((value == null))
-        {
-          synchronized (this.charField)
-            {
-              value = this.charField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<java.lang.Character>('1');
-                    this.charField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  public @java.lang.SuppressWarnings("all") int[] getIntArrayField() {
-    java.util.concurrent.atomic.AtomicReference<int[]> value = this.intArrayField.get();
-    if ((value == null))
-        {
-          synchronized (this.intArrayField)
-            {
-              value = this.intArrayField.get();
-              if ((value == null))
-                  {
-                    value = new java.util.concurrent.atomic.AtomicReference<int[]>(new int[]{1});
-                    this.intArrayField.set(value);
-                  }
-            }
-        }
-    return value.get();
-  }
-  GetterLazyNative() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterNone.java b/test/transform/resource/after-eclipse/GetterNone.java
deleted file mode 100644
index 2ab252ea..00000000
--- a/test/transform/resource/after-eclipse/GetterNone.java
+++ /dev/null
@@ -1,12 +0,0 @@
-import lombok.AccessLevel;
-import lombok.Getter;
-@Getter class GetterNone {
-  int i;
-  @Getter(AccessLevel.NONE) int foo;
-  public @java.lang.SuppressWarnings("all") int getI() {
-    return this.i;
-  }
-  GetterNone() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterOnClass.java b/test/transform/resource/after-eclipse/GetterOnClass.java
deleted file mode 100644
index 421aa150..00000000
--- a/test/transform/resource/after-eclipse/GetterOnClass.java
+++ /dev/null
@@ -1,68 +0,0 @@
-@lombok.Getter class GetterOnClass1 {
-  @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPublic;
-  public @java.lang.SuppressWarnings("all") boolean isPublic() {
-    return this.isPublic;
-  }
-  GetterOnClass1() {
-    super();
-  }
-
-}
-@lombok.Getter(lombok.AccessLevel.PROTECTED) class GetterOnClass2 {
-  @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isProtected;
-  @lombok.Getter(lombok.AccessLevel.PACKAGE) boolean isPackage;
-  @java.lang.SuppressWarnings("all") boolean isPackage() {
-    return this.isPackage;
-  }
-  protected @java.lang.SuppressWarnings("all") boolean isProtected() {
-    return this.isProtected;
-  }
-  GetterOnClass2() {
-    super();
-  }
-}
-@lombok.Getter(lombok.AccessLevel.PACKAGE) class GetterOnClass3 {
-  @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPackage;
-  @java.lang.SuppressWarnings("all") boolean isPackage() {
-    return this.isPackage;
-  }
-  GetterOnClass3() {
-    super();
-  }
-}
-@lombok.Getter(lombok.AccessLevel.PRIVATE) class GetterOnClass4 {
-  @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPrivate;
-  private @java.lang.SuppressWarnings("all") boolean isPrivate() {
-    return this.isPrivate;
-  }
-  GetterOnClass4() {
-    super();
-  }
-}
-@lombok.Getter(lombok.AccessLevel.PUBLIC) class GetterOnClass5 {
-  @lombok.Getter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPublic;
-  public @java.lang.SuppressWarnings("all") boolean isPublic() {
-    return this.isPublic;
-  }
-  GetterOnClass5() {
-    super();
-  }
-}
-@lombok.Getter class GetterOnClass6 {
-  String couldBeNull;
-  @lombok.NonNull String nonNull;
-  public @java.lang.SuppressWarnings("all") String getCouldBeNull() {
-    return this.couldBeNull;
-  }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") String getNonNull() {
-    return this.nonNull;
-  }
-  GetterOnClass6() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterOnStatic.java b/test/transform/resource/after-eclipse/GetterOnStatic.java
deleted file mode 100644
index 538f25cb..00000000
--- a/test/transform/resource/after-eclipse/GetterOnStatic.java
+++ /dev/null
@@ -1,15 +0,0 @@
-class Getter {
-  static @lombok.Getter boolean foo;
-  static @lombok.Getter int bar;
-  <clinit>() {
-  }
-  public static @java.lang.SuppressWarnings("all") boolean isFoo() {
-    return Getter.foo;
-  }
-  public static @java.lang.SuppressWarnings("all") int getBar() {
-    return Getter.bar;
-  }
-  Getter() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/GetterPlain.java b/test/transform/resource/after-eclipse/GetterPlain.java
deleted file mode 100644
index cd096ca3..00000000
--- a/test/transform/resource/after-eclipse/GetterPlain.java
+++ /dev/null
@@ -1,14 +0,0 @@
-import lombok.Getter;
-class GetterPlain {
-  @lombok.Getter int i;
-  @Getter int foo;
-  public @java.lang.SuppressWarnings("all") int getI() {
-    return this.i;
-  }
-  public @java.lang.SuppressWarnings("all") int getFoo() {
-    return this.foo;
-  }
-  GetterPlain() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/GetterWithDollar.java b/test/transform/resource/after-eclipse/GetterWithDollar.java
deleted file mode 100644
index b102ba66..00000000
--- a/test/transform/resource/after-eclipse/GetterWithDollar.java
+++ /dev/null
@@ -1,22 +0,0 @@
-class GetterWithDollar1 {
-  @lombok.Getter int $i;
-  public @java.lang.SuppressWarnings("all") int get$i() {
-    return this.$i;
-  }
-  GetterWithDollar1() {
-    super();
-  }
-}
-class GetterWithDollar2 {
-  @lombok.Getter int $i;
-  @lombok.Getter int i;
-  public @java.lang.SuppressWarnings("all") int get$i() {
-    return this.$i;
-  }
-  public @java.lang.SuppressWarnings("all") int getI() {
-    return this.i;
-  }
-  GetterWithDollar2() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/InjectField.java b/test/transform/resource/after-eclipse/InjectField.java
deleted file mode 100644
index 83d9e5fa..00000000
--- a/test/transform/resource/after-eclipse/InjectField.java
+++ /dev/null
@@ -1,63 +0,0 @@
-import java.util.logging.Level;
-import lombok.extern.java.Log;
-import lombok.Synchronized;
-@Log enum InjectField1 {
-  A(),
-  B(),
-  private final java.lang.Object $lock = new java.lang.Object[0];
-  private static final java.lang.Object $LOCK = new java.lang.Object[0];
-  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField1.class.getName());
-  private static final String LOG_MESSAGE = "static initializer";
-  private String fieldA;
-  static {
-    log.log(Level.FINE, LOG_MESSAGE);
-  }
-  private String fieldB;
-  <clinit>() {
-  }
-  InjectField1() {
-    super();
-  }
-  @Synchronized void generateLockField() {
-    synchronized (this.$lock)
-      {
-        System.out.println("lock field");
-      }
-  }
-  static @Synchronized void generateStaticLockField() {
-    synchronized (InjectField1.$LOCK)
-      {
-        System.out.println("static lock field");
-      }
-  }
-}
-@Log class InjectField2 {
-  private final java.lang.Object $lock = new java.lang.Object[0];
-  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField2.class.getName());
-  private static final String LOG_MESSAGE = "static initializer";
-  static {
-    log.log(Level.FINE, LOG_MESSAGE);
-  }
-  <clinit>() {
-  }
-  InjectField2() {
-    super();
-  }
-  @Synchronized void generateLockField() {
-    synchronized (this.$lock)
-      {
-        System.out.println("lock field");
-      }
-  }
-}
-@Log class InjectField3 {
-  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(InjectField3.class.getName());
-  static {
-    log.log(Level.FINE, "static initializer");
-  }
-  <clinit>() {
-  }
-  InjectField3() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/LoggerCommons.java b/test/transform/resource/after-eclipse/LoggerCommons.java
deleted file mode 100644
index d63bb9c1..00000000
--- a/test/transform/resource/after-eclipse/LoggerCommons.java
+++ /dev/null
@@ -1,17 +0,0 @@
-import lombok.extern.apachecommons.CommonsLog;
-@lombok.extern.apachecommons.CommonsLog class LoggerCommons {
-  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommons.class);
-  <clinit>() {
-  }
-  LoggerCommons() {
-    super();
-  }
-}
-@CommonsLog class LoggerCommonsWithImport {
-  private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(LoggerCommonsWithImport.class);
-  <clinit>() {
-  }
-  LoggerCommonsWithImport() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerJul.java b/test/transform/resource/after-eclipse/LoggerJul.java
deleted file mode 100644
index c98dfe27..00000000
--- a/test/transform/resource/after-eclipse/LoggerJul.java
+++ /dev/null
@@ -1,17 +0,0 @@
-import lombok.extern.java.Log;
-@lombok.extern.java.Log class LoggerJul {
-  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJul.class.getName());
-  <clinit>() {
-  }
-  LoggerJul() {
-    super();
-  }
-}
-@Log class LoggerJulWithImport {
-  private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(LoggerJulWithImport.class.getName());
-  <clinit>() {
-  }
-  LoggerJulWithImport() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerLog4j.java b/test/transform/resource/after-eclipse/LoggerLog4j.java
deleted file mode 100644
index 6814be7b..00000000
--- a/test/transform/resource/after-eclipse/LoggerLog4j.java
+++ /dev/null
@@ -1,17 +0,0 @@
-import lombok.extern.log4j.Log4j;
-@lombok.extern.log4j.Log4j class LoggerLog4j {
-  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4j.class);
-  <clinit>() {
-  }
-  LoggerLog4j() {
-    super();
-  }
-}
-@Log4j class LoggerLog4jWithImport {
-  private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(LoggerLog4jWithImport.class);
-  <clinit>() {
-  }
-  LoggerLog4jWithImport() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerSlf4j.java b/test/transform/resource/after-eclipse/LoggerSlf4j.java
deleted file mode 100644
index 1ccf5c9e..00000000
--- a/test/transform/resource/after-eclipse/LoggerSlf4j.java
+++ /dev/null
@@ -1,30 +0,0 @@
-import lombok.extern.slf4j.Slf4j;
-@lombok.extern.slf4j.Slf4j class LoggerSlf4j {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4j.class);
-  <clinit>() {
-  }
-  LoggerSlf4j() {
-    super();
-  }
-}
-@Slf4j class LoggerSlf4jWithImport {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithImport.class);
-  <clinit>() {
-  }
-  LoggerSlf4jWithImport() {
-    super();
-  }
-}
-class LoggerSlf4jOuter {
-  static @lombok.extern.slf4j.Slf4j class Inner {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
-    <clinit>() {
-    }
-    Inner() {
-      super();
-    }
-  }
-  LoggerSlf4jOuter() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerSlf4jAlreadyExists.java b/test/transform/resource/after-eclipse/LoggerSlf4jAlreadyExists.java
deleted file mode 100644
index 5fb6bc06..00000000
--- a/test/transform/resource/after-eclipse/LoggerSlf4jAlreadyExists.java
+++ /dev/null
@@ -1,6 +0,0 @@
-@lombok.extern.slf4j.Slf4j class LoggerSlf4jAlreadyExists {
-  int log;
-  LoggerSlf4jAlreadyExists() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerSlf4jOnNonType.java b/test/transform/resource/after-eclipse/LoggerSlf4jOnNonType.java
deleted file mode 100644
index f0c2ee58..00000000
--- a/test/transform/resource/after-eclipse/LoggerSlf4jOnNonType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-class LoggerSlf4jOnNonType {
-  LoggerSlf4jOnNonType() {
-    super();
-  }
-  @lombok.extern.slf4j.Slf4j void foo() {
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerSlf4jTypes.java b/test/transform/resource/after-eclipse/LoggerSlf4jTypes.java
deleted file mode 100644
index 95ed1ebf..00000000
--- a/test/transform/resource/after-eclipse/LoggerSlf4jTypes.java
+++ /dev/null
@@ -1,31 +0,0 @@
-@lombok.extern.slf4j.Slf4j interface LoggerSlf4jTypesInterface {
-}
-@lombok.extern.slf4j.Slf4j @interface LoggerSlf4jTypesAnnotation {
-}
-@lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnum {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnum.class);
-  <clinit>() {
-  }
-  LoggerSlf4jTypesEnum() {
-    super();
-  }
-}
-@lombok.extern.slf4j.Slf4j enum LoggerSlf4jTypesEnumWithElement {
-  FOO(),
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jTypesEnumWithElement.class);
-  <clinit>() {
-  }
-  LoggerSlf4jTypesEnumWithElement() {
-    super();
-  }
-}
-interface LoggerSlf4jTypesInterfaceOuter {
-  @lombok.extern.slf4j.Slf4j class Inner {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
-    <clinit>() {
-    }
-    Inner() {
-      super();
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/LoggerSlf4jWithPackage.java b/test/transform/resource/after-eclipse/LoggerSlf4jWithPackage.java
deleted file mode 100644
index 6d395db8..00000000
--- a/test/transform/resource/after-eclipse/LoggerSlf4jWithPackage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package before;
-@lombok.extern.slf4j.Slf4j class LoggerSlf4jWithPackage {
-  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jWithPackage.class);
-  <clinit>() {
-  }
-  LoggerSlf4jWithPackage() {
-    super();
-  }
-}
-class LoggerSlf4jWithPackageOuter {
-  static @lombok.extern.slf4j.Slf4j class Inner {
-    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(Inner.class);
-    <clinit>() {
-    }
-    Inner() {
-      super();
-    }
-  }
-  LoggerSlf4jWithPackageOuter() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/MultiFieldGetter.java b/test/transform/resource/after-eclipse/MultiFieldGetter.java
deleted file mode 100644
index 16368f25..00000000
--- a/test/transform/resource/after-eclipse/MultiFieldGetter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-import lombok.Getter;
-import lombok.AccessLevel;
-class MultiFieldGetter {
-  @Getter(AccessLevel.PROTECTED) int x;
-  @Getter(AccessLevel.PROTECTED) int y;
-  protected @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  protected @java.lang.SuppressWarnings("all") int getY() {
-    return this.y;
-  }
-  MultiFieldGetter() {
-    super();
-  }
-}
-@Getter class MultiFieldGetter2 {
-  @Getter(AccessLevel.PACKAGE) int x;
-  @Getter(AccessLevel.PACKAGE) int y;
-  @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  @java.lang.SuppressWarnings("all") int getY() {
-    return this.y;
-  }
-  MultiFieldGetter2() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/NonNullPlain.java b/test/transform/resource/after-eclipse/NonNullPlain.java
deleted file mode 100644
index c9c96d0a..00000000
--- a/test/transform/resource/after-eclipse/NonNullPlain.java
+++ /dev/null
@@ -1,35 +0,0 @@
-import java.lang.annotation.*;
-@lombok.RequiredArgsConstructor @lombok.Getter @lombok.Setter class NonNullPlain {
-  public @Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE}) @Retention(RetentionPolicy.CLASS) @interface NotNull {
-  }
-  @lombok.NonNull int i;
-  @lombok.NonNull String s;
-  @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");
-    this.i = i;
-    this.s = s;
-  }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") int getI() {
-    return this.i;
-  }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") String getS() {
-    return this.s;
-  }
-  public @java.lang.SuppressWarnings("all") Object getO() {
-    return this.o;
-  }
-  public @java.lang.SuppressWarnings("all") void setI(final @lombok.NonNull int i) {
-    this.i = i;
-  }
-  public @java.lang.SuppressWarnings("all") void setS(final @lombok.NonNull String s) {
-    if ((s == null))
-        throw new java.lang.NullPointerException("s");
-    this.s = s;
-  }
-  public @java.lang.SuppressWarnings("all") void setO(final Object o) {
-    this.o = o;
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/SetterAccessLevel.java b/test/transform/resource/after-eclipse/SetterAccessLevel.java
deleted file mode 100644
index 58baac51..00000000
--- a/test/transform/resource/after-eclipse/SetterAccessLevel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-class SetterAccessLevel {
-  @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
-  @lombok.Setter(lombok.AccessLevel.PRIVATE) boolean isPrivate;
-  @lombok.Setter(lombok.AccessLevel.PACKAGE) boolean isPackage;
-  @lombok.Setter(lombok.AccessLevel.PROTECTED) boolean isProtected;
-  @lombok.Setter(lombok.AccessLevel.PUBLIC) boolean isPublic;
-  @lombok.Setter(value = lombok.AccessLevel.PUBLIC) boolean value;
-  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
-    this.isPrivate = isPrivate;
-  }
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
-    this.isPackage = isPackage;
-  }
-  protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
-    this.isProtected = isProtected;
-  }
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
-    this.isPublic = isPublic;
-  }
-  public @java.lang.SuppressWarnings("all") void setValue(final boolean value) {
-    this.value = value;
-  }
-  SetterAccessLevel() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SetterAlreadyExists.java b/test/transform/resource/after-eclipse/SetterAlreadyExists.java
deleted file mode 100644
index 69983ac5..00000000
--- a/test/transform/resource/after-eclipse/SetterAlreadyExists.java
+++ /dev/null
@@ -1,72 +0,0 @@
-class Setter1 {
-  @lombok.Setter boolean foo;
-  Setter1() {
-    super();
-  }
-  void setFoo(boolean foo) {
-  }
-}
-class Setter2 {
-  @lombok.Setter boolean foo;
-  Setter2() {
-    super();
-  }
-  void setFoo(String foo) {
-  }
-}
-class Setter3 {
-  @lombok.Setter String foo;
-  Setter3() {
-    super();
-  }
-  void setFoo(boolean foo) {
-  }
-}
-class Setter4 {
-  @lombok.Setter String foo;
-  Setter4() {
-    super();
-  }
-  void setFoo(String foo) {
-  }
-}
-class Setter5 {
-  @lombok.Setter String foo;
-  Setter5() {
-    super();
-  }
-  void setFoo() {
-  }
-}
-class Setter6 {
-  @lombok.Setter String foo;
-  Setter6() {
-    super();
-  }
-  void setFoo(String foo, int x) {
-  }
-}
-class Setter7 {
-  @lombok.Setter String foo;
-  Setter7() {
-    super();
-  }
-  static void setFoo() {
-  }
-}
-class Setter8 {
-  @lombok.Setter boolean isFoo;
-  Setter8() {
-    super();
-  }
-  void setIsFoo() {
-  }
-}
-class Setter9 {
-  @lombok.Setter boolean isFoo;
-  Setter9() {
-    super();
-  }
-  void setFoo() {
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/SetterOnClass.java b/test/transform/resource/after-eclipse/SetterOnClass.java
deleted file mode 100644
index 370c0335..00000000
--- a/test/transform/resource/after-eclipse/SetterOnClass.java
+++ /dev/null
@@ -1,69 +0,0 @@
-@lombok.Setter class SetterOnClass1 {
-  @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPublic;
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
-    this.isPublic = isPublic;
-  }
-  SetterOnClass1() {
-    super();
-  }
-}
-@lombok.Setter(lombok.AccessLevel.PROTECTED) class SetterOnClass2 {
-  @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isProtected;
-  @lombok.Setter(lombok.AccessLevel.PACKAGE) boolean isPackage;
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
-    this.isPackage = isPackage;
-  }
-  protected @java.lang.SuppressWarnings("all") void setProtected(final boolean isProtected) {
-    this.isProtected = isProtected;
-  }
-  SetterOnClass2() {
-    super();
-  }
-}
-@lombok.Setter(lombok.AccessLevel.PACKAGE) class SetterOnClass3 {
-  @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPackage;
-  @java.lang.SuppressWarnings("all") void setPackage(final boolean isPackage) {
-    this.isPackage = isPackage;
-  }
-  SetterOnClass3() {
-    super();
-  }
-}
-@lombok.Setter(lombok.AccessLevel.PRIVATE) class SetterOnClass4 {
-  @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPrivate;
-  private @java.lang.SuppressWarnings("all") void setPrivate(final boolean isPrivate) {
-    this.isPrivate = isPrivate;
-  }
-  SetterOnClass4() {
-    super();
-  }
-}
-@lombok.Setter(lombok.AccessLevel.PUBLIC) class SetterOnClass5 {
-  @lombok.Setter(lombok.AccessLevel.NONE) boolean isNone;
-  boolean isPublic;
-  public @java.lang.SuppressWarnings("all") void setPublic(final boolean isPublic) {
-    this.isPublic = isPublic;
-  }
-  SetterOnClass5() {
-    super();
-  }
-}
-@lombok.Setter class SetterOnClass6 {
-  String couldBeNull;
-  @lombok.NonNull String nonNull;
-  public @java.lang.SuppressWarnings("all") void setCouldBeNull(final String couldBeNull) {
-    this.couldBeNull = couldBeNull;
-  }
-  public @java.lang.SuppressWarnings("all") void setNonNull(final @lombok.NonNull String nonNull) {
-    if ((nonNull == null))
-        throw new java.lang.NullPointerException("nonNull");
-    this.nonNull = nonNull;
-  }
-  SetterOnClass6() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SetterOnStatic.java b/test/transform/resource/after-eclipse/SetterOnStatic.java
deleted file mode 100644
index c1e4d3d1..00000000
--- a/test/transform/resource/after-eclipse/SetterOnStatic.java
+++ /dev/null
@@ -1,15 +0,0 @@
-class Setter {
-  static @lombok.Setter boolean foo;
-  static @lombok.Setter int bar;
-  <clinit>() {
-  }
-  public static @java.lang.SuppressWarnings("all") void setFoo(final boolean foo) {
-    Setter.foo = foo;
-  }
-  public static @java.lang.SuppressWarnings("all") void setBar(final int bar) {
-    Setter.bar = bar;
-  }
-  Setter() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SetterPlain.java b/test/transform/resource/after-eclipse/SetterPlain.java
deleted file mode 100644
index 08154244..00000000
--- a/test/transform/resource/after-eclipse/SetterPlain.java
+++ /dev/null
@@ -1,14 +0,0 @@
-import lombok.Setter;
-class SetterPlain {
-  @lombok.Setter int i;
-  @Setter int foo;
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
-    this.i = i;
-  }
-  public @java.lang.SuppressWarnings("all") void setFoo(final int foo) {
-    this.foo = foo;
-  }
-  SetterPlain() {
-    super();
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/SetterWithDollar.java b/test/transform/resource/after-eclipse/SetterWithDollar.java
deleted file mode 100644
index bf27536b..00000000
--- a/test/transform/resource/after-eclipse/SetterWithDollar.java
+++ /dev/null
@@ -1,22 +0,0 @@
-class SetterWithDollar1 {
-  @lombok.Setter int $i;
-  public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
-    this.$i = $i;
-  }
-  SetterWithDollar1() {
-    super();
-  }
-}
-class SetterWithDollar2 {
-  @lombok.Setter int $i;
-  @lombok.Setter int i;
-  public @java.lang.SuppressWarnings("all") void set$i(final int $i) {
-    this.$i = $i;
-  }
-  public @java.lang.SuppressWarnings("all") void setI(final int i) {
-    this.i = i;
-  }
-  SetterWithDollar2() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SimpleTypeResolution.java b/test/transform/resource/after-eclipse/SimpleTypeResolution.java
deleted file mode 100644
index a0997c67..00000000
--- a/test/transform/resource/after-eclipse/SimpleTypeResolution.java
+++ /dev/null
@@ -1,15 +0,0 @@
-class SimpleTypeResolutionFail {
-  private @Getter int x;
-  SimpleTypeResolutionFail() {
-    super();
-  }
-}
-class SimpleTypeResolutionSuccess {
-  private @lombok.Getter int x;
-  public @java.lang.SuppressWarnings("all") int getX() {
-    return this.x;
-  }
-  SimpleTypeResolutionSuccess() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SneakyThrowsMultiple.java b/test/transform/resource/after-eclipse/SneakyThrowsMultiple.java
deleted file mode 100644
index 82eda411..00000000
--- a/test/transform/resource/after-eclipse/SneakyThrowsMultiple.java
+++ /dev/null
@@ -1,63 +0,0 @@
-import java.awt.AWTException;
-import java.io.IOException;
-import java.util.Random;
-class SneakyThrowsMultiple {
-  SneakyThrowsMultiple() {
-    super();
-  }
-  public @lombok.SneakyThrows({IOException.class, Throwable.class}) void test() {
-    try 
-      {
-        try 
-          {
-            System.out.println("test1");
-            throw new IOException();
-          }
-        catch (final IOException $ex)           {
-            throw lombok.Lombok.sneakyThrow($ex);
-          }
-      }
-    catch (final Throwable $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-  public @lombok.SneakyThrows({AWTException.class, IOException.class}) void test2() {
-    try 
-      {
-        try 
-          {
-            System.out.println("test2");
-            if (new Random().nextBoolean())
-                {
-                  throw new IOException();
-                }
-            else
-                {
-                  throw new AWTException("WHAT");
-                }
-          }
-        catch (final AWTException $ex)           {
-            throw lombok.Lombok.sneakyThrow($ex);
-          }
-      }
-    catch (final IOException $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-  public @lombok.SneakyThrows(value = {IOException.class, Throwable.class}) void test3() {
-    try 
-      {
-        try 
-          {
-            System.out.println("test3");
-            throw new IOException();
-          }
-        catch (final IOException $ex)           {
-            throw lombok.Lombok.sneakyThrow($ex);
-          }
-      }
-    catch (final Throwable $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/SneakyThrowsPlain.java b/test/transform/resource/after-eclipse/SneakyThrowsPlain.java
deleted file mode 100644
index 6e75a75c..00000000
--- a/test/transform/resource/after-eclipse/SneakyThrowsPlain.java
+++ /dev/null
@@ -1,24 +0,0 @@
-import lombok.SneakyThrows;
-class SneakyThrowsPlain {
-  SneakyThrowsPlain() {
-    super();
-  }
-  public @lombok.SneakyThrows void test() {
-    try 
-      {
-        System.out.println("test1");
-      }
-    catch (final java.lang.Throwable $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-  public @SneakyThrows void test2() {
-    try 
-      {
-        System.out.println("test2");
-      }
-    catch (final java.lang.Throwable $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SneakyThrowsSingle.java b/test/transform/resource/after-eclipse/SneakyThrowsSingle.java
deleted file mode 100644
index eea593f2..00000000
--- a/test/transform/resource/after-eclipse/SneakyThrowsSingle.java
+++ /dev/null
@@ -1,35 +0,0 @@
-import java.io.IOException;
-class SneakyThrowsSingle {
-  SneakyThrowsSingle() {
-    super();
-  }
-  public @lombok.SneakyThrows(Throwable.class) void test() {
-    try 
-      {
-        System.out.println("test1");
-      }
-    catch (final Throwable $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-  public @lombok.SneakyThrows(IOException.class) void test2() {
-    try 
-      {
-        System.out.println("test2");
-        throw new IOException();
-      }
-    catch (final IOException $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-  public @lombok.SneakyThrows(value = IOException.class) void test3() {
-    try 
-      {
-        System.out.println("test3");
-        throw new IOException();
-      }
-    catch (final IOException $ex)       {
-        throw lombok.Lombok.sneakyThrow($ex);
-      }
-  }
-}
diff --git a/test/transform/resource/after-eclipse/SynchronizedName.java b/test/transform/resource/after-eclipse/SynchronizedName.java
deleted file mode 100644
index a7edd3e7..00000000
--- a/test/transform/resource/after-eclipse/SynchronizedName.java
+++ /dev/null
@@ -1,36 +0,0 @@
-class SynchronizedName {
-  private Object read = new Object();
-  private static Object READ = new Object();
-  <clinit>() {
-  }
-  SynchronizedName() {
-    super();
-  }
-  @lombok.Synchronized("read") void test1() {
-    synchronized (this.read)
-      {
-        System.out.println("one");
-      }
-  }
-  @lombok.Synchronized("write") void test2() {
-    System.out.println("two");
-  }
-  static @lombok.Synchronized("read") void test3() {
-    synchronized (SynchronizedName.read)
-      {
-        System.out.println("three");
-      }
-  }
-  @lombok.Synchronized("READ") void test4() {
-    synchronized (this.READ)
-      {
-        System.out.println("four");
-      }
-  }
-  @lombok.Synchronized(value = "read") void test5() {
-    synchronized (this.read)
-      {
-        System.out.println("five");
-      }
-  }
-}
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/SynchronizedPlain.java b/test/transform/resource/after-eclipse/SynchronizedPlain.java
deleted file mode 100644
index 6856f0ec..00000000
--- a/test/transform/resource/after-eclipse/SynchronizedPlain.java
+++ /dev/null
@@ -1,39 +0,0 @@
-import lombok.Synchronized;
-class SynchronizedPlain1 {
-  private final java.lang.Object $lock = new java.lang.Object[0];
-  SynchronizedPlain1() {
-    super();
-  }
-  @lombok.Synchronized void test() {
-    synchronized (this.$lock)
-      {
-        System.out.println("one");
-      }
-  }
-  @Synchronized void test2() {
-    synchronized (this.$lock)
-      {
-        System.out.println("two");
-      }
-  }
-}
-class SynchronizedPlain2 {
-  private static final java.lang.Object $LOCK = new java.lang.Object[0];
-  <clinit>() {
-  }
-  SynchronizedPlain2() {
-    super();
-  }
-  static @lombok.Synchronized void test() {
-    synchronized (SynchronizedPlain2.$LOCK)
-      {
-        System.out.println("three");
-      }
-  }
-  static @Synchronized void test2() {
-    synchronized (SynchronizedPlain2.$LOCK)
-      {
-        System.out.println("four");
-      }
-  }
-}
diff --git a/test/transform/resource/after-eclipse/ToStringInner.java b/test/transform/resource/after-eclipse/ToStringInner.java
deleted file mode 100644
index 963299db..00000000
--- a/test/transform/resource/after-eclipse/ToStringInner.java
+++ /dev/null
@@ -1,43 +0,0 @@
-import lombok.ToString;
-@ToString class ToStringOuter {
-  @ToString class ToStringInner {
-    final int y;
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("ToStringOuter.ToStringInner(y=" + this.y) + ")");
-    }
-    ToStringInner() {
-      super();
-    }
-  }
-  static @ToString class ToStringStaticInner {
-    final int y;
-    public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("ToStringOuter.ToStringStaticInner(y=" + this.y) + ")");
-    }
-    ToStringStaticInner() {
-      super();
-    }
-  }
-  class ToStringMiddle {
-    @ToString class ToStringMoreInner {
-      final String name;
-      public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-        return (("ToStringOuter.ToStringMiddle.ToStringMoreInner(name=" + this.name) + ")");
-      }
-      ToStringMoreInner() {
-        super();
-      }
-    }
-    ToStringMiddle() {
-      super();
-    }
-  }
-  final int x;
-  String name;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("ToStringOuter(x=" + this.x) + ", name=") + this.name) + ")");
-  }
-  ToStringOuter() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/ToStringPlain.java b/test/transform/resource/after-eclipse/ToStringPlain.java
deleted file mode 100644
index 458f78d0..00000000
--- a/test/transform/resource/after-eclipse/ToStringPlain.java
+++ /dev/null
@@ -1,21 +0,0 @@
-import lombok.ToString;
-@lombok.ToString class ToString1 {
-  final int x;
-  String name;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("ToString1(x=" + this.x) + ", name=") + this.name) + ")");
-  }
-  ToString1() {
-    super();
-  }
-}
-@ToString class ToString2 {
-  final int x;
-  String name;
-  public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-    return (((("ToString2(x=" + this.x) + ", name=") + this.name) + ")");
-  }
-  ToString2() {
-    super();
-  }
-}
diff --git a/test/transform/resource/after-eclipse/TrickyTypeResolution.java b/test/transform/resource/after-eclipse/TrickyTypeResolution.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/TrickyTypeResolution.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/TrickyTypeResolution2.java b/test/transform/resource/after-eclipse/TrickyTypeResolution2.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/TrickyTypeResolution2.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValComplex.java b/test/transform/resource/after-eclipse/ValComplex.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValComplex.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValErrors.java b/test/transform/resource/after-eclipse/ValErrors.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValErrors.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValInFor.java b/test/transform/resource/after-eclipse/ValInFor.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValInFor.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValLessSimple.java b/test/transform/resource/after-eclipse/ValLessSimple.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValLessSimple.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValOutersWithGenerics.java b/test/transform/resource/after-eclipse/ValOutersWithGenerics.java
deleted file mode 100644
index c86d7767..00000000
--- a/test/transform/resource/after-eclipse/ValOutersWithGenerics.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import java.util.*;
-import lombok.val;
-public class ValOutersWithGenerics<Z> {
-  class Inner {
-    Inner() {
-      super();
-    }
-  }
-  static class SubClass extends ValOutersWithGenerics<String> {
-    SubClass() {
-      super();
-    }
-    public void testSubClassOfOutersWithGenerics() {
-      List<Inner> list = new ArrayList<Inner>();
-      final ValOutersWithGenerics<java.lang.String>.Inner elem = list.get(0);
-    }
-  }
-  public ValOutersWithGenerics() {
-    super();
-  }
-  public void testOutersWithGenerics() {
-    List<Inner> list = new ArrayList<Inner>();
-    final ValOutersWithGenerics<Z>.Inner elem = list.get(0);
-  }
-}
diff --git a/test/transform/resource/after-eclipse/ValSimple.java b/test/transform/resource/after-eclipse/ValSimple.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValSimple.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValWeirdTypes.java b/test/transform/resource/after-eclipse/ValWeirdTypes.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValWeirdTypes.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/after-eclipse/ValWithLabel.java b/test/transform/resource/after-eclipse/ValWithLabel.java
deleted file mode 100644
index cb06d3c1..00000000
--- a/test/transform/resource/after-eclipse/ValWithLabel.java
+++ /dev/null
@@ -1 +0,0 @@
-//ignore
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-eclipse/EqualsAndHashCodeWithExistingMethods.java.messages
deleted file mode 100644
index 3ad31311..00000000
--- a/test/transform/resource/messages-eclipse/EqualsAndHashCodeWithExistingMethods.java.messages
+++ /dev/null
@@ -1,3 +0,0 @@
-1 warning Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated).
-10 warning Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated).
-19 warning Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated).
diff --git a/test/transform/resource/messages-eclipse/GetterAlreadyExists.java.messages b/test/transform/resource/messages-eclipse/GetterAlreadyExists.java.messages
deleted file mode 100644
index 86415168..00000000
--- a/test/transform/resource/messages-eclipse/GetterAlreadyExists.java.messages
+++ /dev/null
@@ -1,8 +0,0 @@
-8 warning Not generating isFoo(): A method with that name already exists
-14 warning Not generating isFoo(): A method with that name already exists (getFoo)
-32 warning Not generating getFoo(): A method with that name already exists
-50 warning Not generating getFoo(): A method with that name already exists
-62 warning Not generating isFoo(): A method with that name already exists
-68 warning Not generating isFoo(): A method with that name already exists (getFoo)
-86 warning Not generating getFoo(): A method with that name already exists
-104 warning Not generating getFoo(): A method with that name already exists
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/GetterBoolean.java.messages b/test/transform/resource/messages-eclipse/GetterBoolean.java.messages
deleted file mode 100644
index 51d9dd6e..00000000
--- a/test/transform/resource/messages-eclipse/GetterBoolean.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-13 warning Not generating isFoo(): A method with that name already exists (getFoo)
diff --git a/test/transform/resource/messages-eclipse/GetterLazyInvalid.java.messages b/test/transform/resource/messages-eclipse/GetterLazyInvalid.java.messages
deleted file mode 100644
index 25641930..00000000
--- a/test/transform/resource/messages-eclipse/GetterLazyInvalid.java.messages
+++ /dev/null
@@ -1,6 +0,0 @@
-2 error 'lazy' requires the field to be private and final.
-6 error 'lazy' requires the field to be private and final.
-10 error 'lazy' requires the field to be private and final.
-14 warning 'lazy' does not work with AccessLevel.NONE.
-17 error 'lazy' is not supported for @Getter on a type.
-22 error 'lazy' requires field initialization.
diff --git a/test/transform/resource/messages-eclipse/GetterOnMethod.java.messages b/test/transform/resource/messages-eclipse/GetterOnMethod.java.messages
deleted file mode 100644
index 24e00370..00000000
--- a/test/transform/resource/messages-eclipse/GetterOnMethod.java.messages
+++ /dev/null
@@ -1,2 +0,0 @@
-6 error 'onMethod' is not supported for @Getter on a type.
-11 error 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-eclipse/LoggerSlf4jAlreadyExists.java.messages
deleted file mode 100644
index f03c7660..00000000
--- a/test/transform/resource/messages-eclipse/LoggerSlf4jAlreadyExists.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-1 warning Field 'log' already exists.
diff --git a/test/transform/resource/messages-eclipse/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-eclipse/LoggerSlf4jOnNonStaticInnerClass.java.messages
deleted file mode 100644
index e0bbdb2a..00000000
--- a/test/transform/resource/messages-eclipse/LoggerSlf4jOnNonStaticInnerClass.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-2:9 ERROR @Log is not legal on non-static inner classes.
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-eclipse/LoggerSlf4jOnNonType.java.messages
deleted file mode 100644
index 4af47f01..00000000
--- a/test/transform/resource/messages-eclipse/LoggerSlf4jOnNonType.java.messages
+++ /dev/null
@@ -1,2 +0,0 @@
-2 error @Log is legal only on types.
-2 error The annotation @Slf4j is disallowed for this location
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-eclipse/LoggerSlf4jTypes.java.messages
deleted file mode 100644
index 42236c7c..00000000
--- a/test/transform/resource/messages-eclipse/LoggerSlf4jTypes.java.messages
+++ /dev/null
@@ -1,2 +0,0 @@
-1 error @Log is legal only on classes and enums.
-4 error @Log is legal only on classes and enums.
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/SetterAlreadyExists.java.messages b/test/transform/resource/messages-eclipse/SetterAlreadyExists.java.messages
deleted file mode 100644
index e82f4e6d..00000000
--- a/test/transform/resource/messages-eclipse/SetterAlreadyExists.java.messages
+++ /dev/null
@@ -1,9 +0,0 @@
-2 warning Not generating setFoo(): A method with that name already exists
-7 warning Not generating setFoo(): A method with that name already exists
-12 warning Not generating setFoo(): A method with that name already exists
-17 warning Not generating setFoo(): A method with that name already exists
-22 warning Not generating setFoo(): A method with that name already exists
-27 warning Not generating setFoo(): A method with that name already exists
-32 warning Not generating setFoo(): A method with that name already exists
-37 warning Not generating setFoo(): A method with that name already exists (setIsFoo)
-42 warning Not generating setFoo(): A method with that name already exists
diff --git a/test/transform/resource/messages-eclipse/SetterOnMethod.java.messages b/test/transform/resource/messages-eclipse/SetterOnMethod.java.messages
deleted file mode 100644
index 608489ce..00000000
--- a/test/transform/resource/messages-eclipse/SetterOnMethod.java.messages
+++ /dev/null
@@ -1,2 +0,0 @@
-6 error 'onMethod' is not supported for @Setter on a type.
-11 error 'onMethod' is not supported for @Setter on a type.
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/SetterOnParam.java.messages b/test/transform/resource/messages-eclipse/SetterOnParam.java.messages
deleted file mode 100644
index d067b156..00000000
--- a/test/transform/resource/messages-eclipse/SetterOnParam.java.messages
+++ /dev/null
@@ -1,2 +0,0 @@
-6 error 'onParam' is not supported for @Setter on a type.
-11 error 'onParam' is not supported for @Setter on a type.
\ No newline at end of file
diff --git a/test/transform/resource/messages-eclipse/SimpleTypeResolution.java.messages b/test/transform/resource/messages-eclipse/SimpleTypeResolution.java.messages
deleted file mode 100644
index a5ad71f3..00000000
--- a/test/transform/resource/messages-eclipse/SimpleTypeResolution.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-2 error Getter cannot be resolved to a type
diff --git a/test/transform/resource/messages-eclipse/SynchronizedName.java.messages b/test/transform/resource/messages-eclipse/SynchronizedName.java.messages
deleted file mode 100644
index 2c94551c..00000000
--- a/test/transform/resource/messages-eclipse/SynchronizedName.java.messages
+++ /dev/null
@@ -1 +0,0 @@
-8 error The field write does not exist.
diff --git a/test/transform/src/lombok/transform/RunTransformTests.java b/test/transform/src/lombok/transform/RunTransformTests.java
index 2e644342..0afbc5d6 100644
--- a/test/transform/src/lombok/transform/RunTransformTests.java
+++ b/test/transform/src/lombok/transform/RunTransformTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 The Project Lombok Authors.
+ * Copyright (C) 2011-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,6 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({TestLombokFilesIdempotent.class, TestSourceFiles.class, TestWithDelombok.class, TestWithEcj.class, TestWithEclipse.class})
+@SuiteClasses({TestLombokFilesIdempotent.class, TestSourceFiles.class, TestWithDelombok.class, TestWithEcj.class})
 public class RunTransformTests {
 }
diff --git a/test/transform/src/lombok/transform/TestWithEcj.java b/test/transform/src/lombok/transform/TestWithEcj.java
index 035aed54..9463b531 100644
--- a/test/transform/src/lombok/transform/TestWithEcj.java
+++ b/test/transform/src/lombok/transform/TestWithEcj.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2010 The Project Lombok Authors.
+ * Copyright (C) 2009-2012 The Project Lombok Authors.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,10 @@ import lombok.DirectoryRunner;
 
 import org.junit.runner.RunWith;
 
+// You need to add the following vm-parameter to run the test:
+// -javaagent:${project_loc:lombok}/dist/lombok.jar
+// When running inside eclipse's junit tester, you don't actually need to run 'ant dist' after updating code, though.
+
 @RunWith(DirectoryRunner.class)
 public class TestWithEcj implements DirectoryRunner.TestParams {
 	@Override
diff --git a/test/transform/src/lombok/transform/TestWithEclipse.java b/test/transform/src/lombok/transform/TestWithEclipse.java
deleted file mode 100644
index 4b145329..00000000
--- a/test/transform/src/lombok/transform/TestWithEclipse.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2011 The Project Lombok Authors.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package lombok.transform;
-
-import java.io.File;
-
-import lombok.DirectoryRunner;
-
-import org.junit.runner.RunWith;
-
-// For now you need to add the following vm-parameter to run the test:
-// -javaagent:${project_loc:lombok}/dist/lombok.jar
-
-@RunWith(DirectoryRunner.class)
-public class TestWithEclipse implements DirectoryRunner.TestParams {
-	@Override
-	public DirectoryRunner.Compiler getCompiler() {
-		return DirectoryRunner.Compiler.ECLIPSE;
-	}
-	
-	@Override
-	public boolean printErrors() {
-		return true;
-	}
-	
-	@Override
-	public File getBeforeDirectory() {
-		return new File("test/transform/resource/before");
-	}
-	
-	@Override
-	public File getAfterDirectory() {
-		return new File("test/transform/resource/after-eclipse");
-	}
-	
-	@Override
-	public File getMessagesDirectory() {
-		return new File("test/transform/resource/messages-eclipse");
-	}
-}