fixed tests since Robbert Jan's fix for issue 377.

50 files changed, 346 insertions, 328 deletions

diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index ae7eb0bb..292db928 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -1,5 +1,8 @@
 class AccessorsFluent {
   private @lombok.Getter @lombok.Setter @lombok.experimental.Accessors(fluent = true) String fieldName = "";
+  AccessorsFluent() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") String fieldName() {
     return this.fieldName;
   }
@@ -7,13 +10,13 @@ class AccessorsFluent {
     this.fieldName = fieldName;
     return this;
   }
-  AccessorsFluent() {
-    super();
-  }
 }
 @lombok.experimental.Accessors(fluent = true) @lombok.Getter class AccessorsFluentOnClass {
   private @lombok.Setter String fieldName = "";
   private @lombok.experimental.Accessors String otherFieldWithOverride = "";
+  AccessorsFluentOnClass() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") AccessorsFluentOnClass fieldName(final String fieldName) {
     this.fieldName = fieldName;
     return this;
@@ -24,45 +27,48 @@ class AccessorsFluent {
   public @java.lang.SuppressWarnings("all") String getOtherFieldWithOverride() {
     return this.otherFieldWithOverride;
   }
-  AccessorsFluentOnClass() {
-    super();
-  }
 }
 class AccessorsChain {
   private @lombok.Setter @lombok.experimental.Accessors(chain = true) boolean isRunning;
+  AccessorsChain() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") AccessorsChain setRunning(final boolean isRunning) {
     this.isRunning = isRunning;
     return this;
   }
-  AccessorsChain() {
-    super();
-  }
 }
 @lombok.experimental.Accessors(prefix = "f") class AccessorsPrefix {
   private @lombok.Setter String fieldName;
   private @lombok.Setter String fActualField;
-  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
-    this.fActualField = fActualField;
-  }
   AccessorsPrefix() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
+    this.fActualField = fActualField;
+  }
 }
 @lombok.experimental.Accessors(prefix = {"f", ""}) class AccessorsPrefix2 {
   private @lombok.Setter String fieldName;
   private @lombok.Setter String fActualField;
+  AccessorsPrefix2() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") void setFieldName(final String fieldName) {
     this.fieldName = fieldName;
   }
   public @java.lang.SuppressWarnings("all") void setActualField(final String fActualField) {
     this.fActualField = fActualField;
   }
-  AccessorsPrefix2() {
-    super();
-  }
 }
 @lombok.experimental.Accessors(prefix = "f") @lombok.ToString @lombok.EqualsAndHashCode class AccessorsPrefix3 {
   private String fName;
+  AccessorsPrefix3() {
+    super();
+  }
+  private String getName() {
+    return fName;
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("AccessorsPrefix3(fName=" + this.getName()) + ")");
   }
@@ -90,40 +96,34 @@ class AccessorsChain {
     result = ((result * PRIME) + (($fName == null) ? 0 : $fName.hashCode()));
     return result;
   }
-  AccessorsPrefix3() {
-    super();
-  }
-  private String getName() {
-    return fName;
-  }
 }
 class AccessorsFluentGenerics<T extends Number> {
   private @lombok.Setter @lombok.experimental.Accessors(fluent = true) String name;
+  AccessorsFluentGenerics() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") AccessorsFluentGenerics<T> name(final String name) {
     this.name = name;
     return this;
   }
-  AccessorsFluentGenerics() {
-    super();
-  }
 }
 class AccessorsFluentNoChaining {
   private @lombok.Setter @lombok.experimental.Accessors(fluent = true,chain = false) String name;
-  public @java.lang.SuppressWarnings("all") void name(final String name) {
-    this.name = name;
-  }
   AccessorsFluentNoChaining() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void name(final String name) {
+    this.name = name;
+  }
 }
 class AccessorsFluentStatic<T extends Number> {
   private static @lombok.Setter @lombok.experimental.Accessors(fluent = true) String name;
   <clinit>() {
   }
-  public static @java.lang.SuppressWarnings("all") void name(final String name) {
-    AccessorsFluentStatic.name = name;
-  }
   AccessorsFluentStatic() {
     super();
   }
+  public static @java.lang.SuppressWarnings("all") void name(final String name) {
+    AccessorsFluentStatic.name = name;
+  }
 }
diff --git a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
index fb9df0ea..fdb6f122 100644
--- a/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
+++ b/test/transform/resource/after-ecj/ClassNamedAfterGetter.java
@@ -1,9 +1,9 @@
 class GetFoo {
   private @lombok.Getter int foo;
-  public @java.lang.SuppressWarnings("all") int getFoo() {
-    return this.foo;
-  }
   GetFoo() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") int getFoo() {
+    return this.foo;
+  }
 }
diff --git a/test/transform/resource/after-ecj/CommentsInterspersed.java b/test/transform/resource/after-ecj/CommentsInterspersed.java
index 60c69aed..d708ad72 100644
--- a/test/transform/resource/after-ecj/CommentsInterspersed.java
+++ b/test/transform/resource/after-ecj/CommentsInterspersed.java
@@ -2,11 +2,11 @@ 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();
+  public @java.lang.SuppressWarnings("all") String getTest() {
+    return this.test;
+  }
 }
diff --git a/test/transform/resource/after-ecj/DataExtended.java b/test/transform/resource/after-ecj/DataExtended.java
index dfc64f2d..1de635e3 100644
--- a/test/transform/resource/after-ecj/DataExtended.java
+++ b/test/transform/resource/after-ecj/DataExtended.java
@@ -1,8 +1,5 @@
 @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;
   }
@@ -30,6 +27,9 @@
     result = ((result * PRIME) + this.getX());
     return result;
   }
+  public @java.lang.SuppressWarnings("all") DataExtended() {
+    super();
+  }
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("DataExtended(x=" + this.x) + ")");
   }
diff --git a/test/transform/resource/after-ecj/DataIgnore.java b/test/transform/resource/after-ecj/DataIgnore.java
index 109bf1d6..7d99a20f 100644
--- a/test/transform/resource/after-ecj/DataIgnore.java
+++ b/test/transform/resource/after-ecj/DataIgnore.java
@@ -1,10 +1,6 @@
 @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;
   }
@@ -32,4 +28,8 @@
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (("DataIgnore(x=" + this.getX()) + ")");
   }
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") DataIgnore(final int x) {
+    super();
+    this.x = x;
+  }
 }
diff --git a/test/transform/resource/after-ecj/DataOnEnum.java b/test/transform/resource/after-ecj/DataOnEnum.java
index 8bab5925..0f07088e 100644
--- a/test/transform/resource/after-ecj/DataOnEnum.java
+++ b/test/transform/resource/after-ecj/DataOnEnum.java
@@ -3,14 +3,14 @@ public @lombok.Getter @lombok.ToString @lombok.RequiredArgsConstructor enum Data
   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
+  private @java.lang.SuppressWarnings("all") DataOnEnum(final String someField) {
+    super();
+    this.someField = someField;
+  }
+}
diff --git a/test/transform/resource/after-ecj/DataOnLocalClass.java b/test/transform/resource/after-ecj/DataOnLocalClass.java
index 76a4b47d..137edf50 100644
--- a/test/transform/resource/after-ecj/DataOnLocalClass.java
+++ b/test/transform/resource/after-ecj/DataOnLocalClass.java
@@ -7,10 +7,6 @@ class DataOnLocalClass1 {
     @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;
       }
@@ -50,6 +46,10 @@ class DataOnLocalClass1 {
       public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (((("Local(x=" + this.getX()) + ", name=") + this.getName()) + ")");
       }
+      public @java.lang.SuppressWarnings("all") Local(final int x) {
+        super();
+        this.x = x;
+      }
     }
   }
 }
@@ -58,12 +58,6 @@ 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;
         }
@@ -99,12 +93,14 @@ class DataOnLocalClass2 {
         public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
           return (("Local.InnerLocal(name=" + this.getName()) + ")");
         }
+        public @java.lang.SuppressWarnings("all") InnerLocal(final @lombok.NonNull String name) {
+          super();
+          if ((name == null))
+              throw new java.lang.NullPointerException("name");
+          this.name = name;
+        }
       }
       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;
       }
@@ -132,9 +128,13 @@ class DataOnLocalClass2 {
       public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
         return (("Local(x=" + this.getX()) + ")");
       }
+      public @java.lang.SuppressWarnings("all") Local(final int x) {
+        super();
+        this.x = x;
+      }
     }
   }
   DataOnLocalClass2() {
     super();
   }
-}
\ No newline at end of file
+}
diff --git a/test/transform/resource/after-ecj/DataPlain.java b/test/transform/resource/after-ecj/DataPlain.java
index 0828bc44..1b33070b 100644
--- a/test/transform/resource/after-ecj/DataPlain.java
+++ b/test/transform/resource/after-ecj/DataPlain.java
@@ -2,10 +2,6 @@ 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;
   }
@@ -45,14 +41,14 @@ import lombok.Data;
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Data1(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data1(final int x) {
+    super();
+    this.x = x;
+  }
 }
 @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;
   }
@@ -92,14 +88,14 @@ import lombok.Data;
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Data2(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data2(final int x) {
+    super();
+    this.x = x;
+  }
 }
 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;
   }
@@ -134,9 +130,16 @@ final @Data class Data3 {
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return (((("Data3(x=" + this.getX()) + ", name=") + this.getName()) + ")");
   }
+  public @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") Data3(final int x) {
+    super();
+    this.x = x;
+  }
 }
 final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java.util.Timer {
   int x;
+  Data4() {
+    super();
+  }
   public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
@@ -170,14 +173,8 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
     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;
@@ -198,11 +195,11 @@ final @Data @lombok.EqualsAndHashCode(callSuper = true) class Data4 extends java
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "Data5()";
   }
-}
-final @Data class Data6 {
-  public @java.lang.SuppressWarnings("all") Data6() {
+  public @java.lang.SuppressWarnings("all") Data5() {
     super();
   }
+}
+final @Data class Data6 {
   public @java.lang.Override @java.lang.SuppressWarnings("all") boolean equals(final java.lang.Object o) {
     if ((o == this))
         return true;
@@ -217,4 +214,7 @@ final @Data class Data6 {
   public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
     return "Data6()";
   }
-}
\ No newline at end of file
+  public @java.lang.SuppressWarnings("all") Data6() {
+    super();
+  }
+}
diff --git a/test/transform/resource/after-ecj/DataWithGetter.java b/test/transform/resource/after-ecj/DataWithGetter.java
index cc9ce1c0..9d3dfd3e 100644
--- a/test/transform/resource/after-ecj/DataWithGetter.java
+++ b/test/transform/resource/after-ecj/DataWithGetter.java
@@ -2,10 +2,6 @@
   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;
   }
@@ -45,6 +41,10 @@
   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.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") DataWithGetter(final String z) {
+    super();
+    this.z = z;
+  }
   public @java.lang.SuppressWarnings("all") int getX() {
     return this.x;
   }
@@ -54,4 +54,4 @@
   public @java.lang.SuppressWarnings("all") String getZ() {
     return this.z;
   }
-}
\ No newline at end of file
+}
diff --git a/test/transform/resource/after-ecj/DataWithGetterNone.java b/test/transform/resource/after-ecj/DataWithGetterNone.java
index 6fa5659e..b6b391c8 100644
--- a/test/transform/resource/after-ecj/DataWithGetterNone.java
+++ b/test/transform/resource/after-ecj/DataWithGetterNone.java
@@ -2,10 +2,6 @@
   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;
   }
@@ -45,4 +41,8 @@
   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
+  public @java.beans.ConstructorProperties({"z"}) @java.lang.SuppressWarnings("all") DataWithGetterNone(final String z) {
+    super();
+    this.z = z;
+  }
+}
diff --git a/test/transform/resource/after-ecj/DelegateOnGetter.java b/test/transform/resource/after-ecj/DelegateOnGetter.java
index 4b10bf7f..4eab3791 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetter.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetter.java
@@ -6,6 +6,9 @@ class DelegateOnGetter {
     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>>();
+  DelegateOnGetter() {
+    super();
+  }
   public @Delegate @java.lang.SuppressWarnings("all") Bar getBar() {
     java.util.concurrent.atomic.AtomicReference<Bar> value = this.bar.get();
     if ((value == null))
@@ -38,7 +41,4 @@ class DelegateOnGetter {
   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-ecj/DelegateOnGetterNone.java b/test/transform/resource/after-ecj/DelegateOnGetterNone.java
index 0e303936..a5f52a42 100644
--- a/test/transform/resource/after-ecj/DelegateOnGetterNone.java
+++ b/test/transform/resource/after-ecj/DelegateOnGetterNone.java
@@ -7,13 +7,13 @@ import lombok.Getter;
     int getInt();
   }
   private final @Delegate @Getter(AccessLevel.NONE) Bar bar = null;
+  DelegateOnGetterNone() {
+    super();
+  }
   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-ecj/DelegateOnMethods.java b/test/transform/resource/after-ecj/DelegateOnMethods.java
index 37922e2a..928ea32e 100644
--- a/test/transform/resource/after-ecj/DelegateOnMethods.java
+++ b/test/transform/resource/after-ecj/DelegateOnMethods.java
@@ -3,11 +3,11 @@ 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