From aafd83079a3000d3deb6e40a182849da2509fbfb Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 11 Feb 2013 22:34:48 +0100 Subject: BIG commit: * re-introduction of onMethod/onConstructor/onParam * tests checking error/warnings rewritten to be more heuristic, in order to accomodate difference in messaging between java6 and java 7 * Ability to eliminate java's own output of erroneous error messages (heh); i.e. those messages that are invalidated by lombok's actions. This mechanism is used for onMethod/onConstructor/onParam * First steps to unifying a billion setGeneratedBy calls into a single visitor traversal for eclipse' HandleGetter/Setter/Constructor/Wither * To simplify 'zooming in' the tests on just a few files, added an 'accept' mechanism. * Updated copyright headers of website to 2013. --- .../transform/resource/after-ecj/Constructors.java | 8 +++++ .../resource/after-ecj/GetterOnMethod.java | 19 ++++++++++ .../resource/after-ecj/GetterOnMethodErrors.java | 14 ++++++++ .../resource/after-ecj/GetterOnMethodErrors2.java | 39 +++++++++++++++++++++ .../resource/after-ecj/SetterOnMethod.java | 40 ++++++++++++++++++++++ .../resource/after-ecj/SetterOnMethodOnParam.java | 19 ++++++++++ .../resource/after-ecj/SetterOnParam.java | 40 ++++++++++++++++++++++ .../after-ecj/SetterOnParamAndOnMethod.java | 9 +++++ 8 files changed, 188 insertions(+) create mode 100644 test/transform/resource/after-ecj/GetterOnMethod.java create mode 100644 test/transform/resource/after-ecj/GetterOnMethodErrors.java create mode 100644 test/transform/resource/after-ecj/GetterOnMethodErrors2.java create mode 100644 test/transform/resource/after-ecj/SetterOnMethod.java create mode 100644 test/transform/resource/after-ecj/SetterOnMethodOnParam.java create mode 100644 test/transform/resource/after-ecj/SetterOnParam.java create mode 100644 test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java (limited to 'test/transform/resource/after-ecj') diff --git a/test/transform/resource/after-ecj/Constructors.java b/test/transform/resource/after-ecj/Constructors.java index e994702f..540c2407 100644 --- a/test/transform/resource/after-ecj/Constructors.java +++ b/test/transform/resource/after-ecj/Constructors.java @@ -25,6 +25,14 @@ return new RequiredArgsConstructorStaticName(x); } } +@lombok.RequiredArgsConstructor() class RequiredArgsConstructorWithAnnotations { + final int x; + String name; + public @Deprecated @java.beans.ConstructorProperties({"x"}) @java.lang.SuppressWarnings("all") RequiredArgsConstructorWithAnnotations(final int x) { + super(); + this.x = x; + } +} @lombok.AllArgsConstructor class AllArgsConstructor1 { final int x; String name; diff --git a/test/transform/resource/after-ecj/GetterOnMethod.java b/test/transform/resource/after-ecj/GetterOnMethod.java new file mode 100644 index 00000000..a21f628c --- /dev/null +++ b/test/transform/resource/after-ecj/GetterOnMethod.java @@ -0,0 +1,19 @@ +class GetterOnMethod { + public @interface Test { + } + @lombok.Getter() int i; + @lombok.Getter() int j; + @lombok.Getter() int k; + GetterOnMethod() { + super(); + } + public @Deprecated @java.lang.SuppressWarnings("all") int getI() { + return this.i; + } + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getJ() { + return this.j; + } + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") int getK() { + return this.k; + } +} diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors.java b/test/transform/resource/after-ecj/GetterOnMethodErrors.java new file mode 100644 index 00000000..16c625b5 --- /dev/null +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors.java @@ -0,0 +1,14 @@ +class PlaceFillerToMakeSurePositionIsRelevant { + PlaceFillerToMakeSurePositionIsRelevant() { + super(); + } +} +@lombok.Getter() class GetterOnMethodErrors { + private int test; + GetterOnMethodErrors() { + super(); + } + public @java.lang.SuppressWarnings("all") int getTest() { + return this.test; + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/GetterOnMethodErrors2.java b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java new file mode 100644 index 00000000..bfaa5dd4 --- /dev/null +++ b/test/transform/resource/after-ecj/GetterOnMethodErrors2.java @@ -0,0 +1,39 @@ +class GetterOnMethodErrors2 { + public @interface Test { + } + private @lombok.Getter() int bad1; + private @lombok.Getter() int bad2; + private @lombok.Getter() int bad3; + private @lombok.Getter() int bad4; + private @lombok.Getter() int good1; + private @lombok.Getter() int good2; + private @lombok.Getter() int good3; + private @lombok.Getter() int good4; + GetterOnMethodErrors2() { + super(); + } + public @java.lang.SuppressWarnings("all") int getBad1() { + return this.bad1; + } + public @java.lang.SuppressWarnings("all") int getBad2() { + return this.bad2; + } + public @java.lang.SuppressWarnings("all") int getBad3() { + return this.bad3; + } + public @java.lang.SuppressWarnings("all") int getBad4() { + return this.bad4; + } + public @java.lang.SuppressWarnings("all") int getGood1() { + return this.good1; + } + public @java.lang.SuppressWarnings("all") int getGood2() { + return this.good2; + } + public @Deprecated @java.lang.SuppressWarnings("all") int getGood3() { + return this.good3; + } + public @Deprecated @Test @java.lang.SuppressWarnings("all") int getGood4() { + return this.good4; + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterOnMethod.java b/test/transform/resource/after-ecj/SetterOnMethod.java new file mode 100644 index 00000000..8bdff212 --- /dev/null +++ b/test/transform/resource/after-ecj/SetterOnMethod.java @@ -0,0 +1,40 @@ +import lombok.Setter; +class SetterOnMethod { + @lombok.Setter() int i; + @lombok.Setter() int j; + public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJ(final int j) { + this.j = j; + } + SetterOnMethod() { + super(); + } +} +@lombok.Setter() class SetterOnClassOnMethod { + int i; + int j; + public @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + public @java.lang.SuppressWarnings("all") void setJ(final int j) { + this.j = j; + } + SetterOnClassOnMethod() { + super(); + } +} +@lombok.Setter() class SetterOnClassAndOnAField { + int i; + @lombok.Setter() int j; + public @java.lang.Deprecated @java.lang.SuppressWarnings("all") void setJ(final int j) { + this.j = j; + } + public @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + SetterOnClassAndOnAField() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterOnMethodOnParam.java b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java new file mode 100644 index 00000000..d4ea9f5d --- /dev/null +++ b/test/transform/resource/after-ecj/SetterOnMethodOnParam.java @@ -0,0 +1,19 @@ +class SetterOnMethodOnParam { + public @interface Test { + } + @lombok.Setter() int i; + @lombok.Setter() int j; + @lombok.Setter() int k; + SetterOnMethodOnParam() { + super(); + } + public @Deprecated @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setJ(final @Test int j) { + this.j = j; + } + public @java.lang.Deprecated @Test @java.lang.SuppressWarnings("all") void setK(final @Test int k) { + this.k = k; + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterOnParam.java b/test/transform/resource/after-ecj/SetterOnParam.java new file mode 100644 index 00000000..119c8fc3 --- /dev/null +++ b/test/transform/resource/after-ecj/SetterOnParam.java @@ -0,0 +1,40 @@ +import lombok.Setter; +class SetterOnParam { + @lombok.Setter() int i; + @lombok.Setter() int j; + public @java.lang.SuppressWarnings("all") void setI(final @SuppressWarnings("all") int i) { + this.i = i; + } + public @java.lang.SuppressWarnings("all") void setJ(final @java.lang.SuppressWarnings("all") int j) { + this.j = j; + } + SetterOnParam() { + super(); + } +} +@lombok.Setter() class SetterOnClassOnParam { + int i; + int j; + public @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + public @java.lang.SuppressWarnings("all") void setJ(final int j) { + this.j = j; + } + SetterOnClassOnParam() { + super(); + } +} +@lombok.Setter() class SetterOnClassAndOnAFieldParam { + int i; + @lombok.Setter() int j; + public @java.lang.SuppressWarnings("all") void setJ(final @java.lang.SuppressWarnings("all") int j) { + this.j = j; + } + public @java.lang.SuppressWarnings("all") void setI(final int i) { + this.i = i; + } + SetterOnClassAndOnAFieldParam() { + super(); + } +} \ No newline at end of file diff --git a/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java new file mode 100644 index 00000000..21d22a8f --- /dev/null +++ b/test/transform/resource/after-ecj/SetterOnParamAndOnMethod.java @@ -0,0 +1,9 @@ +class SetterOnParamAndOnMethod { + @lombok.Setter() int i; + public @Deprecated @java.lang.SuppressWarnings("all") void setI(final @SuppressWarnings("all") int i) { + this.i = i; + } + SetterOnParamAndOnMethod() { + super(); + } +} \ No newline at end of file -- cgit