Added full test suite for @Accessors, as well as the new rules for whether or not a method is already there so lombok shouldn't generate it (now number of parameters matters), and added generics testing to RequiredArgsConstructor's static constructor feature.

11 files changed, 118 insertions, 15 deletions

diff --git a/test/transform/resource/after-delombok/Accessors.java b/test/transform/resource/after-delombok/Accessors.java
index 71c4c92e..b21f2de9 100644
--- a/test/transform/resource/after-delombok/Accessors.java
+++ b/test/transform/resource/after-delombok/Accessors.java
@@ -108,4 +108,26 @@ class AccessorsPrefix3 {
 		result = result * PRIME + (this.getName() == null ? 0 : this.getName().hashCode());
 		return result;
 	}
+}
+class AccessorsFluentGenerics<T extends Number> {
+	private String name;
+	@java.lang.SuppressWarnings("all")
+	public AccessorsFluentGenerics<T> name(final String name) {
+		this.name = name;
+		return this;
+	}
+}
+class AccessorsFluentNoChaining {
+	private String name;
+	@java.lang.SuppressWarnings("all")
+	public void name(final String name) {
+		this.name = name;
+	}
+}
+class AccessorsFluentStatic<T extends Number> {
+	private static String name;
+	@java.lang.SuppressWarnings("all")
+	public static void name(final String name) {
+		AccessorsFluentStatic.name = name;
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/Constructors.java b/test/transform/resource/after-delombok/Constructors.java
index baea640f..db48b6b8 100644
--- a/test/transform/resource/after-delombok/Constructors.java
+++ b/test/transform/resource/after-delombok/Constructors.java
@@ -44,4 +44,18 @@ class NoArgsConstructor1 {
 	@java.lang.SuppressWarnings("all")
 	public NoArgsConstructor1() {
 	}
+}
+class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
+	final T x;
+	String name;
+	
+	@java.lang.SuppressWarnings("all")
+	private RequiredArgsConstructorStaticNameGenerics(final T x) {
+		this.x = x;
+	}
+	
+	@java.lang.SuppressWarnings("all")
+	public static <T extends Number> RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
+		return new RequiredArgsConstructorStaticNameGenerics<T>(x);
+	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-delombok/SetterAlreadyExists.java b/test/transform/resource/after-delombok/SetterAlreadyExists.java
index abc6d48f..5bfc1f83 100644
--- a/test/transform/resource/after-delombok/SetterAlreadyExists.java
+++ b/test/transform/resource/after-delombok/SetterAlreadyExists.java
@@ -22,24 +22,32 @@ class Setter5 {
 	String foo;
 	void setFoo() {
 	}
+	@java.lang.SuppressWarnings("all")
+	public void setFoo(final String foo) {
+		this.foo = foo;
+	}
 }
 class Setter6 {
 	String foo;
 	void setFoo(String foo, int x) {
 	}
+	@java.lang.SuppressWarnings("all")
+	public void setFoo(final String foo) {
+		this.foo = foo;
+	}
 }
 class Setter7 {
 	String foo;
-	static void setFoo() {
+	void setFoo(String foo, Object... x) {
 	}
 }
 class Setter8 {
 	boolean isFoo;
-	void setIsFoo() {
+	void setIsFoo(boolean foo) {
 	}
 }
 class Setter9 {
 	boolean isFoo;
-	void setFoo() {
+	void setFoo(boolean foo) {
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/Accessors.java b/test/transform/resource/after-ecj/Accessors.java
index 2650b53f..4ee0ebcd 100644
--- a/test/transform/resource/after-ecj/Accessors.java
+++ b/test/transform/resource/after-ecj/Accessors.java
@@ -93,4 +93,34 @@ class AccessorsChain {
   private String getName() {
     return fName;
   }
-}
\ No newline at end of file
+}
+class AccessorsFluentGenerics<T extends Number> {
+  private @lombok.Setter @lombok.experimental.Accessors(fluent = true) String name;
+  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();
+  }
+}
+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();
+  }
+}
diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java
index 3b3a14da..e6dd8a21 100644
--- a/test/transform/resource/after-ecj/Constructors.java
+++ b/test/transform/resource/after-ecj/Constructors.java
@@ -40,4 +40,15 @@
   public @java.lang.SuppressWarnings("all") NoArgsConstructor1() {
     super();
   }
+}
+@lombok.RequiredArgsConstructor(staticName = "of") class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
+  final T x;
+  String name;
+  private @java.lang.SuppressWarnings("all") RequiredArgsConstructorStaticNameGenerics(final T x) {
+    super();
+    this.x = x;
+  }
+  public static @java.lang.SuppressWarnings("all") <T extends Number>RequiredArgsConstructorStaticNameGenerics<T> of(final T x) {
+    return new RequiredArgsConstructorStaticNameGenerics<T>(x);
+  }
 }
\ No newline at end of file
diff --git a/test/transform/resource/after-ecj/SetterAlreadyExists.java b/test/transform/resource/after-ecj/SetterAlreadyExists.java
index 69983ac5..4c8a212d 100644
--- a/test/transform/resource/after-ecj/SetterAlreadyExists.java
+++ b/test/transform/resource/after-ecj/SetterAlreadyExists.java
@@ -32,6 +32,9 @@ class Setter4 {
 }
 class Setter5 {
   @lombok.Setter String foo;
+  public @java.lang.SuppressWarnings("all") void setFoo(final String foo) {
+    this.foo = foo;
+  }
   Setter5() {
     super();
   }
@@ -40,6 +43,9 @@ class Setter5 {
 }
 class Setter6 {
   @lombok.Setter String foo;
+  public @java.lang.SuppressWarnings("all") void setFoo(final String foo) {
+    this.foo = foo;
+  }
   Setter6() {
     super();
   }
@@ -51,7 +57,7 @@ class Setter7 {
   Setter7() {
     super();
   }
-  static void setFoo() {
+  void setFoo(String foo, Object... x) {
   }
 }
 class Setter8 {
@@ -59,7 +65,7 @@ class Setter8 {
   Setter8() {
     super();
   }
-  void setIsFoo() {
+  void setIsFoo(boolean foo) {
   }
 }
 class Setter9 {
@@ -67,6 +73,6 @@ class Setter9 {
   Setter9() {
     super();
   }
-  void setFoo() {
+  void setFoo(boolean foo) {
   }
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/Accessors.java b/test/transform/resource/before/Accessors.java
index 18547620..3ef8a02f 100644
--- a/test/transform/resource/before/Accessors.java
+++ b/test/transform/resource/before/Accessors.java
@@ -35,4 +35,16 @@ class AccessorsPrefix3 {
 	private String getName() {
 		return fName;
 	}
+}
+
+class AccessorsFluentGenerics<T extends Number> {
+	@lombok.Setter @lombok.experimental.Accessors(fluent=true) private String name;
+}
+
+class AccessorsFluentNoChaining {
+	@lombok.Setter @lombok.experimental.Accessors(fluent=true,chain=false) private String name;
+}
+
+class AccessorsFluentStatic<T extends Number> {
+	@lombok.Setter @lombok.experimental.Accessors(fluent=true) private static String name;
 }
\ No newline at end of file
diff --git a/test/transform/resource/before/Constructors.java b/test/transform/resource/before/Constructors.java
index 6ac228d6..272fa850 100644
--- a/test/transform/resource/before/Constructors.java
+++ b/test/transform/resource/before/Constructors.java
@@ -17,4 +17,8 @@
 @lombok.NoArgsConstructor class NoArgsConstructor1 {
 	int x;
 	String name;
-}
\ No newline at end of file
+}
+@lombok.RequiredArgsConstructor(staticName="of") class RequiredArgsConstructorStaticNameGenerics<T extends Number> {
+	final T x;
+	String name;
+}
diff --git a/test/transform/resource/before/SetterAlreadyExists.java b/test/transform/resource/before/SetterAlreadyExists.java
index 9ac56d8a..8d995b39 100644
--- a/test/transform/resource/before/SetterAlreadyExists.java
+++ b/test/transform/resource/before/SetterAlreadyExists.java
@@ -30,16 +30,16 @@ class Setter6 {
 }
 class Setter7 {
 	@lombok.Setter String foo;
-	static void setFoo() {
+	void setFoo(String foo, Object... x) {
 	}
 }
 class Setter8 {
 	@lombok.Setter boolean isFoo;
-	void setIsFoo() {
+	void setIsFoo(boolean foo) {
 	}
 }
 class Setter9 {
 	@lombok.Setter boolean isFoo;
-	void setFoo() {
+	void setFoo(boolean foo) {
 	}
 }
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages
index e1c0ee7d..7a4279c4 100644
--- a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages
+++ b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages
@@ -2,8 +2,6 @@
 7:9 WARNING Not generating setFoo(): A method with that name already exists
 12:9 WARNING Not generating setFoo(): A method with that name already exists
 17:9 WARNING Not generating setFoo(): A method with that name already exists
-22:9 WARNING Not generating setFoo(): A method with that name already exists
-27:9 WARNING Not generating setFoo(): A method with that name already exists
 32:9 WARNING Not generating setFoo(): A method with that name already exists
 37:9 WARNING Not generating setFoo(): A method with that name already exists (setIsFoo)
 42:9 WARNING Not generating setFoo(): A method with that name already exists
diff --git a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages
index e82f4e6d..bc97510c 100644
--- a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages
+++ b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages
@@ -2,8 +2,6 @@
 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