11 files changed, 165 insertions, 2 deletions
diff --git a/test/transform/resource/after-ecj/BuilderWithTolerate.java b/test/transform/resource/after-ecj/BuilderWithTolerate.java
new file mode 100644
index 00000000..0b9b46a0
--- /dev/null
+++ b/test/transform/resource/after-ecj/BuilderWithTolerate.java
@@ -0,0 +1,34 @@
+import lombok.Builder;
+import lombok.experimental.Tolerate;
+public @Builder class BuilderWithTolerate {
+  public static class BuilderWithTolerateBuilder {
+    private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int value;
+    public @Tolerate BuilderWithTolerateBuilder value(String s) {
+      return this.value(Integer.parseInt(s));
+    }
+    @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder() {
+      super();
+    }
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder value(final int value) {
+      this.value = value;
+      return this;
+    }
+    public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerate build() {
+      return new BuilderWithTolerate(value);
+    }
+    public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") java.lang.String toString() {
+      return (("BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value) + ")");
+    }
+  }
+  private final int value;
+  public static void main(String[] args) {
+    BuilderWithTolerate.builder().value("42").build();
+  }
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerate(final int value) {
+    super();
+    this.value = value;
+  }
+  public static @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") BuilderWithTolerateBuilder builder() {
+    return new BuilderWithTolerateBuilder();
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/FieldDefaults.java b/test/transform/resource/after-ecj/FieldDefaults.java
index e76c1251..a6941b7b 100644
--- a/test/transform/resource/after-ecj/FieldDefaults.java
+++ b/test/transform/resource/after-ecj/FieldDefaults.java
@@ -1,14 +1,20 @@
 @lombok.experimental.FieldDefaults(makeFinal = true) class FieldDefaults1 {
+  static int STATIC = 3;
   final int x;
   @lombok.experimental.NonFinal int y;
+  <clinit>() {
+  }
   FieldDefaults1(int x) {
     super();
     this.x = x;
   }
 }
 @lombok.experimental.FieldDefaults(level = lombok.AccessLevel.PRIVATE) class FieldDefaults2 {
+  static int STATIC = 3;
   @lombok.experimental.PackagePrivate int x;
   private int y;
+  <clinit>() {
+  }
   FieldDefaults2() {
     super();
   }
diff --git a/test/transform/resource/after-ecj/GetterLazyTransient.java b/test/transform/resource/after-ecj/GetterLazyTransient.java
new file mode 100644
index 00000000..9bc0d9ae
--- /dev/null
+++ b/test/transform/resource/after-ecj/GetterLazyTransient.java
@@ -0,0 +1,28 @@
+class GetterLazyTransient {
+  private final @lombok.Getter(lazy = true) java.util.concurrent.atomic.AtomicReference<java.lang.Object> nonTransientField = new java.util.concurrent.atomic.AtomicReference<java.lang.Object>();
+  private final transient @lombok.Getter(lazy = true) int transientField = 2;
+  private final transient @lombok.Getter int nonLazyTransientField = 3;
+  GetterLazyTransient() {
+    super();
+  }
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getNonTransientField() {
+    java.lang.Object value = this.nonTransientField.get();
+    if ((value == null))
+        {
+          synchronized (this.nonTransientField)
+            {
+              value = this.nonTransientField.get();
+              if ((value == null))
+                  {
+                    final int actualValue = 1;
+                    value = actualValue;
+                    this.nonTransientField.set(value);
+                  }
+            }
+        }
+    return (java.lang.Integer) value;
+  }
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") int getNonLazyTransientField() {
+    return this.nonLazyTransientField;
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/NoArgsConstructorForce.java b/test/transform/resource/after-ecj/NoArgsConstructorForce.java
new file mode 100644
index 00000000..d0e69b0d
--- /dev/null
+++ b/test/transform/resource/after-ecj/NoArgsConstructorForce.java
@@ -0,0 +1,12 @@
+import lombok.NoArgsConstructor;
+public @NoArgsConstructor(force = true) class NoArgsConstructorForce {
+  private final int[] i;
+  private final Object[] o;
+  private final java.util.List<?>[] fullQualifiedList;
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") NoArgsConstructorForce() {
+    super();
+    this.i = null;
+    this.o = null;
+    this.fullQualifiedList = null;
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValNullInit.java b/test/transform/resource/after-ecj/ValNullInit.java
new file mode 100644
index 00000000..bd89c023
--- /dev/null
+++ b/test/transform/resource/after-ecj/ValNullInit.java
@@ -0,0 +1,10 @@
+import lombok.val;
+
+class ValNullInit {
+  ValNullInit() {
+    super();
+  }
+  void method() {
+    final @val java.lang.Object x = null;
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/ValueStaticField.java b/test/transform/resource/after-ecj/ValueStaticField.java
index 4ce84a02..75e337ce 100644
--- a/test/transform/resource/after-ecj/ValueStaticField.java
+++ b/test/transform/resource/after-ecj/ValueStaticField.java
@@ -1,7 +1,7 @@
 import lombok.Value;
 final @Value class ValueStaticField {
-  private static int x;
-  private static final String PASSWORD = "Ken sent me";
+  static int x;
+  static String PASSWORD = "Ken sent me";
   <clinit>() {
   }
   public @java.lang.Override @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean equals(final java.lang.Object o) {
diff --git a/test/transform/resource/after-ecj/VarComplex.java b/test/transform/resource/after-ecj/VarComplex.java
new file mode 100644
index 00000000..10c456eb
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarComplex.java
@@ -0,0 +1,26 @@
+import lombok.experimental.var;
+public class VarComplex {
+  private String field = "";
+  private static final int CONSTANT = 20;
+  <clinit>() {
+  }
+  public VarComplex() {
+    super();
+  }
+  public void testComplex() {
+    @var char[] shouldBeCharArray = field.toCharArray();
+    @var int shouldBeInt = CONSTANT;
+    @var java.lang.Object lock = new Object();
+    synchronized (lock)
+      {
+        @var int field = 20;
+        @var int inner = 10;
+        switch (field) {
+        case 5 :
+            @var char[] shouldBeCharArray2 = shouldBeCharArray;
+            @var int innerInner = inner;
+        }
+      }
+    @var java.lang.String shouldBeString = field;
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarInFor.java b/test/transform/resource/after-ecj/VarInFor.java
new file mode 100644
index 00000000..0192aaed
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarInFor.java
@@ -0,0 +1,14 @@
+import lombok.experimental.var;
+public class VarInFor {
+  public VarInFor() {
+    super();
+  }
+  public void enhancedFor() {
+    int[] list = new int[]{1, 2};
+    for (@var int shouldBeInt : list)
+      {
+        System.out.println(shouldBeInt);
+        @var int shouldBeInt2 = shouldBeInt;
+      }
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarInForOld.java b/test/transform/resource/after-ecj/VarInForOld.java
new file mode 100644
index 00000000..98fedf03
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarInForOld.java
@@ -0,0 +1,12 @@
+import lombok.experimental.var;
+public class VarInForOld {
+  public VarInForOld() {
+    super();
+  }
+  public void oldFor() {
+    for (@var int i = 0;; (i < 100); ++ i)
+      {
+        System.out.println(i);
+      }
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarModifier.java b/test/transform/resource/after-ecj/VarModifier.java
new file mode 100644
index 00000000..d11142ca
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarModifier.java
@@ -0,0 +1,12 @@
+import lombok.experimental.var;
+public class VarModifier {
+  private String field = "";
+  public VarModifier() {
+    super();
+  }
+  public void testComplex() {
+    final @var char[] shouldBeFinalCharArray = field.toCharArray();
+    @var char[] shouldBeCharArray = field.toCharArray();
+
+  }
+}
+\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/VarNullInit.java b/test/transform/resource/after-ecj/VarNullInit.java
new file mode 100644
index 00000000..3eb2d506
--- /dev/null
+++ b/test/transform/resource/after-ecj/VarNullInit.java
@@ -0,0 +1,9 @@
+import lombok.experimental.var;
+public class VarNullInit {
+  public VarNullInit() {
+    super();
+  }
+  void method() {
+    @var java.lang.Object x = null;
+  }
+}
+\ No newline at end of file