diff options
author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2012-10-25 00:07:44 +0200 |
---|---|---|
committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2012-10-25 00:07:44 +0200 |
commit | d2808d407a65da9fe1e290a83df0f0da107f0cf8 (patch) | |
tree | 80e577330ebef88dbd91c1de59951cbff94af9e8 /test/transform/resource/messages-ecj | |
parent | 2d216118986115bf309c050cd841bbe8b62b80b3 (diff) | |
download | lombok-d2808d407a65da9fe1e290a83df0f0da107f0cf8.tar.gz lombok-d2808d407a65da9fe1e290a83df0f0da107f0cf8.tar.bz2 lombok-d2808d407a65da9fe1e290a83df0f0da107f0cf8.zip |
The testrunner now uses a different mechanism to verify correctness of produced errors and warnings (i.e. we intentionally compile code with errors in them to verify that the appropriate error or warning message is emitted when lombok is active during a compilation run of either javac or ecj) - instead of string comparisons, it's a little more complex. This to enable testing of both javac6 and javac7, even if they produce (slightly) different error output.
Updated all message files in the 'expected output' directories to represent this change.
Diffstat (limited to 'test/transform/resource/messages-ecj')
25 files changed, 60 insertions, 60 deletions
diff --git a/test/transform/resource/messages-ecj/Accessors.java.messages b/test/transform/resource/messages-ecj/Accessors.java.messages index 88594029..3e6bbd69 100644 --- a/test/transform/resource/messages-ecj/Accessors.java.messages +++ b/test/transform/resource/messages-ecj/Accessors.java.messages @@ -1 +1 @@ -19 warning Not generating setter for this field: It does not fit your @Accessors prefix list. +19:530 Not generating setter for this field: It does not fit your @Accessors prefix list. diff --git a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages index ecbf4a61..50f2e97f 100644 --- a/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages +++ b/test/transform/resource/messages-ecj/ConflictingStaticConstructorNames.java.messages @@ -1 +1 @@ -1 warning Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. +1:0 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used. diff --git a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages index 3ad31311..db144316 100644 --- a/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages +++ b/test/transform/resource/messages-ecj/EqualsAndHashCodeWithExistingMethods.java.messages @@ -1,3 +1,3 @@ -1 warning Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). -10 warning Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). -19 warning Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +1:0 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). +10:125 Not generating equals and hashCode: A method with one of those names already exists. (Either all or none of these methods will be generated). +19:274 Not generating equals, hashCode and canEquals: A method with one of those names already exists. (Either all or none of these methods will be generated). diff --git a/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages b/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages index 4dffedef..5903679b 100644 --- a/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages +++ b/test/transform/resource/messages-ecj/FieldDefaultsNoop.java.messages @@ -1 +1 @@ -1 error This does nothing; provide either level or makeFinal or both.
\ No newline at end of file +1:0 This does nothing; provide either level or makeFinal or both.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages index 86415168..ae62a1fb 100644 --- a/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/GetterAlreadyExists.java.messages @@ -1,8 +1,8 @@ -8 warning Not generating isFoo(): A method with that name already exists -14 warning Not generating isFoo(): A method with that name already exists (getFoo) -32 warning Not generating getFoo(): A method with that name already exists -50 warning Not generating getFoo(): A method with that name already exists -62 warning Not generating isFoo(): A method with that name already exists -68 warning Not generating isFoo(): A method with that name already exists (getFoo) -86 warning Not generating getFoo(): A method with that name already exists -104 warning Not generating getFoo(): A method with that name already exists
\ No newline at end of file +8:102 Not generating isFoo(): A method with that name already exists +14:186 Not generating isFoo(): A method with that name already exists (getFoo) +32:436 Not generating getFoo(): A method with that name already exists +50:688 Not generating getFoo(): A method with that name already exists +62:868 Not generating isFoo(): A method with that name already exists +68:961 Not generating isFoo(): A method with that name already exists (getFoo) +86:1240 Not generating getFoo(): A method with that name already exists +104:1510 Not generating getFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/GetterBoolean.java.messages b/test/transform/resource/messages-ecj/GetterBoolean.java.messages index 51d9dd6e..8ae086f6 100644 --- a/test/transform/resource/messages-ecj/GetterBoolean.java.messages +++ b/test/transform/resource/messages-ecj/GetterBoolean.java.messages @@ -1 +1 @@ -13 warning Not generating isFoo(): A method with that name already exists (getFoo) +13:220 Not generating isFoo(): A method with that name already exists (getFoo) diff --git a/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages b/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages index 25641930..9ecf0fc0 100644 --- a/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages +++ b/test/transform/resource/messages-ecj/GetterLazyInvalid.java.messages @@ -1,6 +1,6 @@ -2 error 'lazy' requires the field to be private and final. -6 error 'lazy' requires the field to be private and final. -10 error 'lazy' requires the field to be private and final. -14 warning 'lazy' does not work with AccessLevel.NONE. -17 error 'lazy' is not supported for @Getter on a type. -22 error 'lazy' requires field initialization. +2:35 'lazy' requires the field to be private and final. +6:132 'lazy' requires the field to be private and final. +10:232 'lazy' requires the field to be private and final. +14:315 'lazy' does not work with AccessLevel.NONE. +17:412 'lazy' is not supported for @Getter on a type. +22:544 'lazy' requires field initialization. diff --git a/test/transform/resource/messages-ecj/GetterOnMethod.java.messages b/test/transform/resource/messages-ecj/GetterOnMethod.java.messages index 24e00370..4b240da0 100644 --- a/test/transform/resource/messages-ecj/GetterOnMethod.java.messages +++ b/test/transform/resource/messages-ecj/GetterOnMethod.java.messages @@ -1,2 +1,2 @@ -6 error 'onMethod' is not supported for @Getter on a type. -11 error 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file +6:0 'onMethod' is not supported for @Getter on a type. +11:0 'onMethod' is not supported for @Getter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages index f03c7660..859e29d8 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jAlreadyExists.java.messages @@ -1 +1 @@ -1 warning Field 'log' already exists. +1:0 Field 'log' already exists. diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages index e0bbdb2a..570a169b 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonStaticInnerClass.java.messages @@ -1 +1 @@ -2:9 ERROR @Log is not legal on non-static inner classes.
\ No newline at end of file +2:9 @Log is not legal on non-static inner classes.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages index 5fff2629..b6848135 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jOnNonType.java.messages @@ -1 +1 @@ -2 error The annotation @Slf4j is disallowed for this location
\ No newline at end of file +2:30 The annotation @Slf4j is disallowed for this location diff --git a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages index e23aa524..b9f8b63f 100644 --- a/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages +++ b/test/transform/resource/messages-ecj/LoggerSlf4jTypes.java.messages @@ -1,2 +1,2 @@ -1 error @Slf4j is legal only on classes and enums. -4 error @Slf4j is legal only on classes and enums.
\ No newline at end of file +1:0 @Slf4j is legal only on classes and enums. +4:67 @Slf4j is legal only on classes and enums. diff --git a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages index d33024db..5fc0a365 100644 --- a/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/SetterAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2 warning Not generating setFoo(): A method with that name already exists -8 warning Not generating setFoo(): A method with that name already exists -14 warning Not generating setFoo(): A method with that name already exists -20 warning Not generating setFoo(): A method with that name already exists -38 warning Not generating setFoo(): A method with that name already exists -44 warning Not generating setFoo(): A method with that name already exists (setIsFoo) -50 warning Not generating setFoo(): A method with that name already exists
\ No newline at end of file +2:17 Not generating setFoo(): A method with that name already exists +8:96 Not generating setFoo(): A method with that name already exists +14:174 Not generating setFoo(): A method with that name already exists +20:252 Not generating setFoo(): A method with that name already exists +38:480 Not generating setFoo(): A method with that name already exists +44:570 Not generating setFoo(): A method with that name already exists (setIsFoo) +50:653 Not generating setFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/SetterOnMethod.java.messages b/test/transform/resource/messages-ecj/SetterOnMethod.java.messages index 608489ce..ecfa3f69 100644 --- a/test/transform/resource/messages-ecj/SetterOnMethod.java.messages +++ b/test/transform/resource/messages-ecj/SetterOnMethod.java.messages @@ -1,2 +1,2 @@ -6 error 'onMethod' is not supported for @Setter on a type. -11 error 'onMethod' is not supported for @Setter on a type.
\ No newline at end of file +6:0 'onMethod' is not supported for @Setter on a type. +11:0 'onMethod' is not supported for @Setter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SetterOnParam.java.messages b/test/transform/resource/messages-ecj/SetterOnParam.java.messages index d067b156..7d0c4a1e 100644 --- a/test/transform/resource/messages-ecj/SetterOnParam.java.messages +++ b/test/transform/resource/messages-ecj/SetterOnParam.java.messages @@ -1,2 +1,2 @@ -6 error 'onParam' is not supported for @Setter on a type. -11 error 'onParam' is not supported for @Setter on a type.
\ No newline at end of file +6:0 'onParam' is not supported for @Setter on a type. +11:0 'onParam' is not supported for @Setter on a type.
\ No newline at end of file diff --git a/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages b/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages index 2d49e9a9..eb33b0df 100644 --- a/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages +++ b/test/transform/resource/messages-ecj/SimpleTypeResolution.java.messages @@ -1 +1 @@ -2 error Getter cannot be resolved to a type
\ No newline at end of file +2:35 Getter cannot be resolved to a type diff --git a/test/transform/resource/messages-ecj/SynchronizedName.java.messages b/test/transform/resource/messages-ecj/SynchronizedName.java.messages index 4c428aac..0ad3be0a 100644 --- a/test/transform/resource/messages-ecj/SynchronizedName.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedName.java.messages @@ -1 +1 @@ -8 warning The static field SynchronizedName.READ should be accessed in a static way +8:185 The static field SynchronizedName.READ should be accessed in a static way diff --git a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages index f16d071a..b07f020c 100644 --- a/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedNameNoSuchField.java.messages @@ -1 +1 @@ -5 error The field write does not exist. +5:120 The field write does not exist. diff --git a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages index c207cd70..834877ef 100644 --- a/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages +++ b/test/transform/resource/messages-ecj/SynchronizedNameStaticToInstanceRef.java.messages @@ -1 +1 @@ -5 error Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read +5:127 Cannot make a static reference to the non-static field SynchronizedNameStaticToInstanceRef.read diff --git a/test/transform/resource/messages-ecj/ValErrors.java.messages b/test/transform/resource/messages-ecj/ValErrors.java.messages index 0a23326c..fda58094 100644 --- a/test/transform/resource/messages-ecj/ValErrors.java.messages +++ b/test/transform/resource/messages-ecj/ValErrors.java.messages @@ -1,2 +1,2 @@ -5 error d cannot be resolved to a variable -9 error 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) +5:95 d cannot be resolved to a variable +9:143 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... }) diff --git a/test/transform/resource/messages-ecj/ValInBasicFor.java.messages b/test/transform/resource/messages-ecj/ValInBasicFor.java.messages index 23ffd6fd..068d72b9 100644 --- a/test/transform/resource/messages-ecj/ValInBasicFor.java.messages +++ b/test/transform/resource/messages-ecj/ValInBasicFor.java.messages @@ -1,4 +1,4 @@ -6 error 'val' is not allowed in old-style for loops -6 error Type mismatch: cannot convert from int to val -6 error 'val' is not allowed in old-style for loops -6 error 'val' is not allowed in old-style for loops
\ No newline at end of file +6:160 'val' is not allowed in old-style for loops +6:171 Type mismatch: cannot convert from int to val +6:174 'val' is not allowed in old-style for loops +6:187 'val' is not allowed in old-style for loops diff --git a/test/transform/resource/messages-ecj/ValRawType.java.messages b/test/transform/resource/messages-ecj/ValRawType.java.messages index b2b8d753..b7669ede 100644 --- a/test/transform/resource/messages-ecj/ValRawType.java.messages +++ b/test/transform/resource/messages-ecj/ValRawType.java.messages @@ -1 +1 @@ -13 warning List is a raw type. References to generic type List<E> should be parameterized
\ No newline at end of file +13:260 List is a raw type. References to generic type List<E> should be parameterized diff --git a/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages b/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages index bba8913b..87459eb2 100644 --- a/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages +++ b/test/transform/resource/messages-ecj/WitherAlreadyExists.java.messages @@ -1,7 +1,7 @@ -2 warning Not generating withFoo(): A method with that name already exists -12 warning Not generating withFoo(): A method with that name already exists -22 warning Not generating withFoo(): A method with that name already exists -32 warning Not generating withFoo(): A method with that name already exists -62 warning Not generating withFoo(): A method with that name already exists -72 warning Not generating withFoo(): A method with that name already exists (withIsFoo) -82 warning Not generating withFoo(): A method with that name already exists +2:17 Not generating withFoo(): A method with that name already exists +12:141 Not generating withFoo(): A method with that name already exists +22:264 Not generating withFoo(): A method with that name already exists +32:386 Not generating withFoo(): A method with that name already exists +62:746 Not generating withFoo(): A method with that name already exists +72:880 Not generating withFoo(): A method with that name already exists (withIsFoo) +82:1008 Not generating withFoo(): A method with that name already exists diff --git a/test/transform/resource/messages-ecj/WitherOnStatic.java.messages b/test/transform/resource/messages-ecj/WitherOnStatic.java.messages index 5b52d54f..72e39f62 100644 --- a/test/transform/resource/messages-ecj/WitherOnStatic.java.messages +++ b/test/transform/resource/messages-ecj/WitherOnStatic.java.messages @@ -1,2 +1,2 @@ -2 warning Not generating wither for this field: Withers cannot be generated for static fields. -3 warning Not generating wither for this field: Withers cannot be generated for static fields. +2:24 Not generating wither for this field: Withers cannot be generated for static fields. +3:73 Not generating wither for this field: Withers cannot be generated for static fields. diff --git a/test/transform/resource/messages-ecj/WitherWithDollar.java.messages b/test/transform/resource/messages-ecj/WitherWithDollar.java.messages index e55530e3..93203dbb 100644 --- a/test/transform/resource/messages-ecj/WitherWithDollar.java.messages +++ b/test/transform/resource/messages-ecj/WitherWithDollar.java.messages @@ -1 +1 @@ -2 warning Not generating wither for this field: Withers cannot be generated for fields starting with $. +2:26 Not generating wither for this field: Withers cannot be generated for fields starting with $. |