Fix more broken tests

16 files changed, 30 insertions, 25 deletions

diff --git a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
index 352a0723..a4afb8a8 100644
--- a/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularMapsWithSetterPrefix.java
@@ -95,7 +95,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMan(Object rawMapKey, Object rawMapValue) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withRawMap(Object rawMapKey, Object rawMapValue) {
 			if (this.rawMap$key == null) {
 				this.rawMap$key = new java.util.ArrayList<Object>();
 				this.rawMap$value = new java.util.ArrayList<Object>();
@@ -125,7 +125,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> stringMap(String stringMapKey, V stringMapValue) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(String stringMapKey, V stringMapValue) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
@@ -135,7 +135,7 @@ class BuilderSingularMapsWithSetterPrefix<K, V> {
 			return this;
 		}
 		@SuppressWarnings("all")
-		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> stringMap(java.util.Map<? extends String, ? extends V> stringMap) {
+		public BuilderSingularMapsWithSetterPrefixBuilder<K, V> withStringMap(java.util.Map<? extends String, ? extends V> stringMap) {
 			if (this.stringMap$key == null) {
 				this.stringMap$key = new java.util.ArrayList<String>();
 				this.stringMap$value = new java.util.ArrayList<V>();
diff --git a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
index 367f0ac1..8e849f44 100644
--- a/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
@@ -1,5 +1,6 @@
 import java.util.List;
 import java.util.Collection;
+@Builder(toBuilder = true, setterPrefix = "with")
 class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
 	private List<?> objects;
 	private Collection<? extends Number> numbers;
diff --git a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
index be581c47..45a79fdc 100644
--- a/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithAccessorsWithSetterPrefix.java
@@ -39,7 +39,7 @@ class BuilderWithAccessorsWithSetterPrefix {
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
-		public BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) {
+		public BuilderWithAccessorsWithSetterPrefixBuilder with_bar(final int _bar) {
 			this._bar = _bar;
 			return this;
 		}
diff --git a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
index 95f89c9d..9b7b0c95 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -2,7 +2,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
 	public static <Z extends Number> BuilderWithExistingBuilderClassWithSetterPrefix<String, Z> staticMethod(Z arg1, boolean arg2, String arg3) {
 		return null;
 	}
-	public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z extends Number> {
+	public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder<Z extends Number> {
 		@java.lang.SuppressWarnings("all")
 		private boolean arg2;
 		@java.lang.SuppressWarnings("all")
@@ -11,7 +11,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
 		public void withArg2(boolean arg) {
 		}
 		@java.lang.SuppressWarnings("all")
-		BuilderWithExistingBuilderClassWithSetterPrefixBuilder() {
+		BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
 		public BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z> withArg1(final Z arg1) {
diff --git a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
index 0f478ed1..2381dcbe 100644
--- a/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithNoBuilderMethodWithSetterPrefix.java
@@ -1,3 +1,4 @@
+import lombok.Builder
 class BuilderWithNoBuilderMethodWithSetterPrefix {
 	private String a = "";
 	@java.lang.SuppressWarnings("all")
diff --git a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
index 322c667c..091aed4d 100644
--- a/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-delombok/BuilderWithToBuilderWithSetterPrefix.java
@@ -1,4 +1,5 @@
 import java.util.List;
+import lombok.Builder;
 class BuilderWithToBuilderWithSetterPrefix<T> {
 	private String mOne;
 	private String mTwo;
diff --git a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
index ad3485c6..110774e2 100644
--- a/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSimpleWithSetterPrefix.java
@@ -1,8 +1,8 @@
 import java.util.List;
 @lombok.Builder(access = lombok.AccessLevel.PROTECTED,setterPrefix = "with") class BuilderSimpleWithSetterPrefix<T> {
-  protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefix<T> {
+  protected static @java.lang.SuppressWarnings("all") class BuilderSimpleWithSetterPrefixBuilder<T> {
     private @java.lang.SuppressWarnings("all") int unprefixed;
-    @java.lang.SuppressWarnings("all") BuilderWithPrefixBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSimpleWithSetterPrefixBuilder() {
       super();
     }
     public @java.lang.SuppressWarnings("all") BuilderWithPrefixBuilder<T> withUnprefixed(final int unprefixed) {
diff --git a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java
index 8728867d..ef2d02a1 100644
--- a/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularToBuilderWithNullWithSetterPrefix.java
@@ -1,5 +1,5 @@
 import lombok.Singular;
-@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix {
+@lombok.Builder(toBuilder = true,setterPrefix = "with") class BuilderSingularToBuilderWithNullWithSetterPrefix {
   public static @java.lang.SuppressWarnings("all") class BuilderSingularToBuilderWithNullWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> elems;
     @java.lang.SuppressWarnings("all") BuilderSingularToBuilderWithNullWithSetterPrefixBuilder() {
diff --git a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
index fe451d78..bbb10087 100644
--- a/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularWildcardListsWithToBuilderWithSetterPrefix.java
@@ -1,7 +1,7 @@
 import java.util.List;
 import java.util.Collection;
 import lombok.Singular;
-@lombok.Builder(toBuilder = true, setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
+@lombok.Builder(toBuilder = true,setterPrefix = "with") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefix {
   public static @java.lang.SuppressWarnings("all") class BuilderSingularWildcardListsWithToBuilderWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<java.lang.Object> objects;
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<Number> numbers;
diff --git a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java
index 88f64f34..920803cc 100644
--- a/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderSingularWithPrefixesWithSetterPrefix.java
@@ -1,23 +1,23 @@
 import lombok.Singular;
-@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefixes {
-  public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixesBuilder {
+@lombok.Builder(setterPrefix = "with") @lombok.experimental.Accessors(prefix = "_") class BuilderSingularWithPrefixesWithSetterPrefix {
+  public static @java.lang.SuppressWarnings("all") class BuilderSingularWithPrefixesWithSetterPrefixBuilder {
     private @java.lang.SuppressWarnings("all") java.util.ArrayList<String> elems;
-    @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder() {
+    @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder() {
       super();
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder withElem(final String elem) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder withElem(final String elem) {
       if ((this.elems == null))
           this.elems = new java.util.ArrayList<String>();
       this.elems.add(elem);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder withElems(final java.util.Collection<? extends String> elems) {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder withElems(final java.util.Collection<? extends String> elems) {
       if ((this.elems == null))
           this.elems = new java.util.ArrayList<String>();
       this.elems.addAll(elems);
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder clearElems() {
+    public @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder clearElems() {
       if ((this.elems != null))
           this.elems.clear();
       return this;
@@ -37,7 +37,7 @@ import lombok.Singular;
       return new BuilderSingularWithPrefixesWithSetterPrefixes(elems);
     }
     public @java.lang.Override @java.lang.SuppressWarnings("all") java.lang.String toString() {
-      return (("BuilderSingularWithPrefixesWithSetterPrefixes.BuilderSingularWithPrefixesWithSetterPrefixesBuilder(elems=" + this.elems) + ")");
+      return (("BuilderSingularWithPrefixesWithSetterPrefixes.BuilderSingularWithPrefixesWithSetterPrefixBuilder(elems=" + this.elems) + ")");
     }
   }
   private @Singular java.util.List<String> _elems;
@@ -45,7 +45,7 @@ import lombok.Singular;
     super();
     this._elems = elems;
   }
-  public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixesBuilder builder() {
-    return new BuilderSingularWithPrefixesWithSetterPrefixesBuilder();
+  public static @java.lang.SuppressWarnings("all") BuilderSingularWithPrefixesWithSetterPrefixBuilder builder() {
+    return new BuilderSingularWithPrefixesWithSetterPrefixBuilder();
   }
 }
diff --git a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java
index 679591a4..065c93fe 100644
--- a/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderValueDataWithSetterPrefix.java
@@ -41,7 +41,7 @@ final @lombok.Builder(setterPrefix = "with") @lombok.Value class BuilderAndValue
     return (("BuilderAndValueWithSetterPrefix(zero=" + this.getZero()) + ")");
   }
 }
-@lombok.Builder @lombok.Data class BuilderAndDataWithSetterPrefix {
+@lombok.Builder(setterPrefix = "with") @lombok.Data class BuilderAndDataWithSetterPrefix {
   public static @java.lang.SuppressWarnings("all") class BuilderAndDataWithSetterPrefixBuilder {
     @java.lang.SuppressWarnings("all") BuilderAndDataWithSetterPrefixBuilder() {
       super();
diff --git a/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java
index 5894a4a2..d9c10e5b 100644
--- a/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithAccessorsWithSetterPrefix.java
@@ -19,7 +19,7 @@
       this.foo = foo;
       return this;
     }
-    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder with_Bar(final int _bar) {
+    public @java.lang.SuppressWarnings("all") BuilderWithAccessorsWithSetterPrefixBuilder with_bar(final int _bar) {
       this._bar = _bar;
       return this;
     }
diff --git a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
index 8da2f012..b14c120f 100644
--- a/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/after-ecj/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -1,6 +1,6 @@
 import lombok.Builder;
 class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
-  public static class BuilderWithExistingBuilderClassWithSetterPrefixBuilder<Z extends Number> {
+  public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder<Z extends Number> {
     private @java.lang.SuppressWarnings("all") boolean arg2;
     private @java.lang.SuppressWarnings("all") String arg3;
     private Z arg1;
diff --git a/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java b/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java
index cb699295..99c3ccc6 100644
--- a/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithExistingBuilderClassWithSetterPrefix.java
@@ -6,7 +6,7 @@ class BuilderWithExistingBuilderClassWithSetterPrefix<T, K extends Number> {
 		return null;
 	}
 	
-	public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefix<Z extends Number> {
+	public static class BuilderWithExistingBuilderClassBuilderWithSetterPrefixBuilder<Z extends Number> {
 		private Z arg1;
 		
 		public void withArg2(boolean arg) {
diff --git a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
index b787e303..6fddd748 100644
--- a/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
+++ b/test/transform/resource/before/BuilderWithNoBuilderMethodWithSetterPrefix.java
@@ -1,5 +1,5 @@
-import lombok.Builder(setterPrefix = "with");
-@Builder(toBuilder = true, builderMethodName = "", setterPrefix = "with")
+import lombok.Builder
+@Builder(toBuilder = true, builderMethodName = "",setterPrefix = "with")
 class BuilderWithNoBuilderMethodWithSetterPrefix {
 	private String a = "";
 }
diff --git a/test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages b/test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages
new file mode 100644
index 00000000..8719789b
--- /dev/null
+++ b/test/transform/resource/messages-ecj/BuilderSingularNoAutoWithSetterPrefix.java.messages
@@ -0,0 +1,2 @@
+8 The singular must be specified explicitly (e.g. @Singular("task")) because auto singularization is disabled.
+10 The singular must be specified explicitly (e.g. @Singular("task")) because auto singularization is disabled.