Untangling patches to classes that only exist in eclipse, not ecj

Specifically, Rawi01's patches to make javadoc behaviour in eclipse better,
which cannot be applied to ecj as you get load errors (javadoc not a thing there).

As part of this commit, tests can be limited to ecj or eclipse, and I made cut-down
versions of a few tests (to run on ecj, as the main one cannot be, due to javadoc issues).

The tests now marked as eclipse only don't fail on ecj, but they don't generate the same
result. Alternatively, we could go with a separated out after-ecj and after-eclipse dir
instead, but that's perhaps going overboard.

26 files changed, 121 insertions, 5 deletions

diff --git a/test/transform/resource/before/BuilderJavadoc.java b/test/transform/resource/before/BuilderJavadoc.java
index 390e2096..d966af28 100644
--- a/test/transform/resource/before/BuilderJavadoc.java
+++ b/test/transform/resource/before/BuilderJavadoc.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 import java.util.List;
 
 @lombok.Builder
diff --git a/test/transform/resource/before/BuilderWithDeprecated.java b/test/transform/resource/before/BuilderWithDeprecated.java
index 1641ccb4..1b41444c 100644
--- a/test/transform/resource/before/BuilderWithDeprecated.java
+++ b/test/transform/resource/before/BuilderWithDeprecated.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 import com.google.common.collect.ImmutableList;
 import lombok.Builder;
 import lombok.Singular;
diff --git a/test/transform/resource/before/BuilderWithDeprecatedAnnOnly.java b/test/transform/resource/before/BuilderWithDeprecatedAnnOnly.java
new file mode 100644
index 00000000..1d2d199c
--- /dev/null
+++ b/test/transform/resource/before/BuilderWithDeprecatedAnnOnly.java
@@ -0,0 +1,10 @@
+import com.google.common.collect.ImmutableList;
+import lombok.Builder;
+import lombok.Singular;
+
+@Builder
+public class BuilderWithDeprecatedAnnOnly {
+	@Deprecated int dep1;
+	@Singular @Deprecated java.util.List<String> strings;
+	@Singular @Deprecated ImmutableList<Integer> numbers;
+}
diff --git a/test/transform/resource/before/DelegateAlreadyImplemented.java b/test/transform/resource/before/DelegateAlreadyImplemented.java
index c43c1949..feaf3c4b 100644
--- a/test/transform/resource/before/DelegateAlreadyImplemented.java
+++ b/test/transform/resource/before/DelegateAlreadyImplemented.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 public class DelegateAlreadyImplemented<T> {
 	
 	@lombok.experimental.Delegate
diff --git a/test/transform/resource/before/DelegateFlagUsage.java b/test/transform/resource/before/DelegateFlagUsage.java
index 1f274e24..0b52c764 100644
--- a/test/transform/resource/before/DelegateFlagUsage.java
+++ b/test/transform/resource/before/DelegateFlagUsage.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 //conf: lombok.delegate.flagUsage = warning
 //skip compare content: We're just checking if the flagUsage key works.
 public class DelegateFlagUsage {
diff --git a/test/transform/resource/before/DelegateGenerics.java b/test/transform/resource/before/DelegateGenerics.java
index e89158a9..f00c90aa 100644
--- a/test/transform/resource/before/DelegateGenerics.java
+++ b/test/transform/resource/before/DelegateGenerics.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 public class DelegateGenerics<T> {
 	@lombok.experimental.Delegate
 	I1<T> target;
diff --git a/test/transform/resource/before/DelegateOnGetter.java b/test/transform/resource/before/DelegateOnGetter.java
index afe09ff4..ad9d1cfb 100644
--- a/test/transform/resource/before/DelegateOnGetter.java
+++ b/test/transform/resource/before/DelegateOnGetter.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.Delegate;
 import lombok.Getter;
 
diff --git a/test/transform/resource/before/DelegateOnGetterNone.java b/test/transform/resource/before/DelegateOnGetterNone.java
index f9a97e6a..cd471369 100644
--- a/test/transform/resource/before/DelegateOnGetterNone.java
+++ b/test/transform/resource/before/DelegateOnGetterNone.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.AccessLevel;
 import lombok.experimental.Delegate;
 import lombok.Getter;
diff --git a/test/transform/resource/before/DelegateOnMethods.java b/test/transform/resource/before/DelegateOnMethods.java
index 79189cc1..4ea70d74 100644
--- a/test/transform/resource/before/DelegateOnMethods.java
+++ b/test/transform/resource/before/DelegateOnMethods.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.experimental.Delegate;
 
 abstract class DelegateOnMethods {
diff --git a/test/transform/resource/before/DelegateOnStatic.java b/test/transform/resource/before/DelegateOnStatic.java
index 7a420b20..b9b728bc 100644
--- a/test/transform/resource/before/DelegateOnStatic.java
+++ b/test/transform/resource/before/DelegateOnStatic.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 //skip compare content
 import lombok.experimental.Delegate;
 import lombok.Getter;
diff --git a/test/transform/resource/before/DelegateRecursion.java b/test/transform/resource/before/DelegateRecursion.java
index d74107e2..c6428d06 100644
--- a/test/transform/resource/before/DelegateRecursion.java
+++ b/test/transform/resource/before/DelegateRecursion.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 //skip compare content: This test is to see if the 'delegate recursion is not supported' error pops up.
 import lombok.experimental.Delegate;
 class DelegateRecursionOuterMost {
diff --git a/test/transform/resource/before/DelegateTypesAndExcludes.java b/test/transform/resource/before/DelegateTypesAndExcludes.java
index 164261d8..2c0f8770 100644
--- a/test/transform/resource/before/DelegateTypesAndExcludes.java
+++ b/test/transform/resource/before/DelegateTypesAndExcludes.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.experimental.Delegate;
 class DelegatePlain {
 	@Delegate(types = Bar.class)
diff --git a/test/transform/resource/before/DelegateWithDeprecated.java b/test/transform/resource/before/DelegateWithDeprecated.java
index a0deb788..bf3519b3 100644
--- a/test/transform/resource/before/DelegateWithDeprecated.java
+++ b/test/transform/resource/before/DelegateWithDeprecated.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.experimental.Delegate;
 
 class DelegateWithDeprecated {
diff --git a/test/transform/resource/before/DelegateWithVarargs.java b/test/transform/resource/before/DelegateWithVarargs.java
index 0c266620..91519884 100644
--- a/test/transform/resource/before/DelegateWithVarargs.java
+++ b/test/transform/resource/before/DelegateWithVarargs.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.experimental.Delegate;
 
 class DelegateWithVarargs {
diff --git a/test/transform/resource/before/DelegateWithVarargs2.java b/test/transform/resource/before/DelegateWithVarargs2.java
index 8a3dbf14..bc3fdf09 100644
--- a/test/transform/resource/before/DelegateWithVarargs2.java
+++ b/test/transform/resource/before/DelegateWithVarargs2.java
@@ -1,3 +1,4 @@
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.experimental.Delegate;
 
 class DelegateWithVarargs2 {
diff --git a/test/transform/resource/before/GetterDeprecated.java b/test/transform/resource/before/GetterDeprecated.java
index 01b66bca..9d67297b 100644
--- a/test/transform/resource/before/GetterDeprecated.java
+++ b/test/transform/resource/before/GetterDeprecated.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 import lombok.Getter;
 class GetterDeprecated {
 	
@@ -8,4 +9,4 @@ class GetterDeprecated {
 	 * @deprecated
 	 */
 	@Getter int javadoc;
-}
\ No newline at end of file
+}
diff --git a/test/transform/resource/before/GetterSetterJavadoc.java b/test/transform/resource/before/GetterSetterJavadoc.java
index 2ad46f8d..44b970e8 100644
--- a/test/transform/resource/before/GetterSetterJavadoc.java
+++ b/test/transform/resource/before/GetterSetterJavadoc.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 @lombok.Data
 class GetterSetterJavadoc1 {
 	/**
diff --git a/test/transform/resource/before/GetterSetterJavadocEcj.java b/test/transform/resource/before/GetterSetterJavadocEcj.java
new file mode 100644
index 00000000..1c24851c
--- /dev/null
+++ b/test/transform/resource/before/GetterSetterJavadocEcj.java
@@ -0,0 +1,65 @@
+//platform ecj: Javadoc copying not supported on ecj - testing that the javadoc doesnt cause any crashes
+@lombok.Data
+class GetterSetterJavadoc1 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World1
+	 * --- GETTER ---
+	 * Getter section
+	 *
+	 * @return Sky is blue1
+	 */
+	private int fieldName;
+}
+
+class GetterSetterJavadoc2 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World2
+	 * @return Sky is blue2
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
+
+class GetterSetterJavadoc3 {
+	/**
+	 * Some text
+	 *
+	 * **SETTER**
+	 * Setter section
+	 * @param fieldName Hello, World3
+	 * **GETTER**
+	 * Getter section
+	 * @return Sky is blue3
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
+
+@lombok.experimental.Accessors(chain = true, fluent = true)
+class GetterSetterJavadoc4 {
+	/**
+	 * Some text
+	 *
+	 * @param fieldName Hello, World4
+	 * @return Sky is blue4
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
+
+@lombok.experimental.Accessors(chain = true, fluent = true)
+class GetterSetterJavadoc5 {
+	/**
+	 * Some text
+	 *
+	 * **SETTER**
+	 * Setter section
+	 * @param fieldName Hello, World5
+	 * @return Sky is blue5
+	 * **GETTER**
+	 * Getter section
+	 * @return Sky is blue5
+	 */
+	@lombok.Getter @lombok.Setter private int fieldName;
+}
diff --git a/test/transform/resource/before/OnXJava7StyleOn8.java b/test/transform/resource/before/OnXJava7StyleOn8.java
index 582fe6ce..94865c97 100644
--- a/test/transform/resource/before/OnXJava7StyleOn8.java
+++ b/test/transform/resource/before/OnXJava7StyleOn8.java
@@ -1,4 +1,4 @@
-//platform ecj
+//platform ecj,eclipse
 //version 8:
 
 public class OnXJava7StyleOn8 {
diff --git a/test/transform/resource/before/OnXJava8StyleOn7.java b/test/transform/resource/before/OnXJava8StyleOn7.java
index c006e468..98f76451 100644
--- a/test/transform/resource/before/OnXJava8StyleOn7.java
+++ b/test/transform/resource/before/OnXJava8StyleOn7.java
@@ -1,4 +1,4 @@
-//platform ecj
+//platform ecj,eclipse
 //version :7
 
 public class OnXJava8StyleOn7 {
diff --git a/test/transform/resource/before/SetterAndWithMethodJavadoc.java b/test/transform/resource/before/SetterAndWithMethodJavadoc.java
index ba10b7f2..0317cf27 100644
--- a/test/transform/resource/before/SetterAndWithMethodJavadoc.java
+++ b/test/transform/resource/before/SetterAndWithMethodJavadoc.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 import lombok.With;
 class SetterAndWithMethodJavadoc {
 	/**
diff --git a/test/transform/resource/before/SetterDeprecated.java b/test/transform/resource/before/SetterDeprecated.java
index e655622f..a4c2ea94 100644
--- a/test/transform/resource/before/SetterDeprecated.java
+++ b/test/transform/resource/before/SetterDeprecated.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 import lombok.Setter;
 class SetterDeprecated {
 	
@@ -8,4 +9,4 @@ class SetterDeprecated {
 	 * @deprecated
 	 */
 	@Setter int javadoc;
-}
\ No newline at end of file
+}
diff --git a/test/transform/resource/before/SetterDeprecatedEcj.java b/test/transform/resource/before/SetterDeprecatedEcj.java
new file mode 100644
index 00000000..361a4fb7
--- /dev/null
+++ b/test/transform/resource/before/SetterDeprecatedEcj.java
@@ -0,0 +1,12 @@
+//platform ecj: Javadoc copying not supported on ecj
+import lombok.Setter;
+class SetterDeprecated {
+	
+	@Deprecated
+	@Setter int annotation;
+	
+	/**
+	 * @deprecated
+	 */
+	@Setter int javadoc;
+}
diff --git a/test/transform/resource/before/ValDelegateMethodReference.java b/test/transform/resource/before/ValDelegateMethodReference.java
index 7adc402a..21b781aa 100644
--- a/test/transform/resource/before/ValDelegateMethodReference.java
+++ b/test/transform/resource/before/ValDelegateMethodReference.java
@@ -1,4 +1,4 @@
-
+//platform !eclipse: Requires a 'full' eclipse with intialized workspace, and we don't (yet) have that set up properly in the test run.
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Delegate;
diff --git a/test/transform/resource/before/WithMethodMarkedDeprecated.java b/test/transform/resource/before/WithMethodMarkedDeprecated.java
index 7a6549e5..659ea1de 100644
--- a/test/transform/resource/before/WithMethodMarkedDeprecated.java
+++ b/test/transform/resource/before/WithMethodMarkedDeprecated.java
@@ -1,3 +1,4 @@
+//platform !ecj: Javadoc copying not supported on ecj
 import lombok.With;
 
 class WithMethodMarkedDeprecated {
diff --git a/test/transform/resource/before/WithMethodMarkedDeprecatedAnnOnly.java b/test/transform/resource/before/WithMethodMarkedDeprecatedAnnOnly.java
new file mode 100644
index 00000000..50509545
--- /dev/null
+++ b/test/transform/resource/before/WithMethodMarkedDeprecatedAnnOnly.java
@@ -0,0 +1,10 @@
+import lombok.With;
+
+class WithMethodMarkedDeprecatedAnnOnly {
+	
+	@Deprecated
+	@With int annotation;
+	
+	WithMethodMarkedDeprecatedAnnOnly(int annotation) {
+	}
+}
\ No newline at end of file