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.

24 files changed, 74 insertions, 116 deletions

diff --git a/test/transform/resource/messages-delombok/Accessors.java.messages b/test/transform/resource/messages-delombok/Accessors.java.messages
index 4c7a0daa..367621bd 100644
--- a/test/transform/resource/messages-delombok/Accessors.java.messages
+++ b/test/transform/resource/messages-delombok/Accessors.java.messages
@@ -1 +1 @@
-19:9 WARNING Not generating setter for this field: It does not fit your @Accessors prefix list.
\ No newline at end of file
+19:9 Not generating setter for this field: It does not fit your @Accessors prefix list.
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages b/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages
index 40366cd7..06b88c10 100644
--- a/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages
+++ b/test/transform/resource/messages-delombok/ConflictingStaticConstructorNames.java.messages
@@ -1 +1 @@
-1:1 WARNING Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used.
+1:1 Ignoring static constructor name: explicit @XxxArgsConstructor annotation present; its `staticName` parameter will be used.
diff --git a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages
index dd78e67f..057a7521 100644
--- a/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages
+++ b/test/transform/resource/messages-delombok/EqualsAndHashCodeWithExistingMethods.java.messages
@@ -1,3 +1,3 @@
-1: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:1 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: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).
+1:1 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:1 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:1 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-delombok/FieldDefaultsNoop.java.messages b/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages
index 65fed477..ae5dd265 100644
--- a/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages
+++ b/test/transform/resource/messages-delombok/FieldDefaultsNoop.java.messages
@@ -1 +1 @@
-1:1 ERROR This does nothing; provide either level or makeFinal or both.
\ No newline at end of file
+1:1 This does nothing; provide either level or makeFinal or both.
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages b/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages
index 302bbced..7a326742 100644
--- a/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages
+++ b/test/transform/resource/messages-delombok/GetterAlreadyExists.java.messages
@@ -1,8 +1,8 @@
-8:9 WARNING Not generating isFoo(): A method with that name already exists
-14:9 WARNING Not generating isFoo(): A method with that name already exists (getFoo)
-32:9 WARNING Not generating getFoo(): A method with that name already exists
-50:9 WARNING Not generating getFoo(): A method with that name already exists
-62:9 WARNING Not generating isFoo(): A method with that name already exists
-68:9 WARNING Not generating isFoo(): A method with that name already exists (getFoo)
-86:9 WARNING Not generating getFoo(): A method with that name already exists
-104:9 WARNING Not generating getFoo(): A method with that name already exists
+8:9 Not generating isFoo(): A method with that name already exists
+14:9 Not generating isFoo(): A method with that name already exists (getFoo)
+32:9 Not generating getFoo(): A method with that name already exists
+50:9 Not generating getFoo(): A method with that name already exists
+62:9 Not generating isFoo(): A method with that name already exists
+68:9 Not generating isFoo(): A method with that name already exists (getFoo)
+86:9 Not generating getFoo(): A method with that name already exists
+104:9 Not generating getFoo(): A method with that name already exists
diff --git a/test/transform/resource/messages-delombok/GetterBoolean.java.messages b/test/transform/resource/messages-delombok/GetterBoolean.java.messages
index 3d14bcc9..91ad3512 100644
--- a/test/transform/resource/messages-delombok/GetterBoolean.java.messages
+++ b/test/transform/resource/messages-delombok/GetterBoolean.java.messages
@@ -1 +1 @@
-13:9 WARNING Not generating isFoo(): A method with that name already exists (getFoo)
\ No newline at end of file
+13:9 Not generating isFoo(): A method with that name already exists (getFoo)
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages b/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages
index 4f7e3df8..5c72fd56 100644
--- a/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages
+++ b/test/transform/resource/messages-delombok/GetterLazyInvalid.java.messages
@@ -1,6 +1,6 @@
-2:9 ERROR 'lazy' requires the field to be private and final.
-6:9 ERROR 'lazy' requires the field to be private and final.
-10:9 ERROR 'lazy' requires the field to be private and final.
-14:9 WARNING 'lazy' does not work with AccessLevel.NONE.
-17:1 ERROR 'lazy' is not supported for @Getter on a type.
-22:9 ERROR 'lazy' requires field initialization.
\ No newline at end of file
+2:9 'lazy' requires the field to be private and final.
+6:9 'lazy' requires the field to be private and final.
+10:9 'lazy' requires the field to be private and final.
+14:9 'lazy' does not work with AccessLevel.NONE.
+17:1 'lazy' is not supported for @Getter on a type.
+22:9 'lazy' requires field initialization.
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/GetterOnMethod.java.messages b/test/transform/resource/messages-delombok/GetterOnMethod.java.messages
index d437cb05..db5ef9a6 100644
--- a/test/transform/resource/messages-delombok/GetterOnMethod.java.messages
+++ b/test/transform/resource/messages-delombok/GetterOnMethod.java.messages
@@ -1,17 +1,7 @@
-3:34 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Getter.AnyAnnotation
-4:44 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Getter.AnyAnnotation
-6:26 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Getter.AnyAnnotation
-11:26 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Getter.AnyAnnotation
-14:44 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Getter.AnyAnnotation
-6:1 ERROR 'onMethod' is not supported for @Getter on a type.
-11:1 ERROR 'onMethod' is not supported for @Getter on a type.
+3:34 incompatible types
+4:44 incompatible types
+6:26 incompatible types
+11:26 incompatible types
+14:44 incompatible types
+6:1 'onMethod' is not supported for @Getter on a type.
+11:1 'onMethod' is not supported for @Getter on a type.
diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages
index ede6defa..8aa22226 100644
--- a/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages
+++ b/test/transform/resource/messages-delombok/LoggerSlf4jAlreadyExists.java.messages
@@ -1 +1 @@
-1:1 WARNING Field 'log' already exists.
+1:1 Field 'log' already exists.
diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages
index e0bbdb2a..570a169b 100644
--- a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonStaticInnerClass.java.messages
+++ b/test/transform/resource/messages-delombok/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-delombok/LoggerSlf4jOnNonType.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages
index 9143d4bc..ebc23411 100644
--- a/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages
+++ b/test/transform/resource/messages-delombok/LoggerSlf4jOnNonType.java.messages
@@ -1 +1 @@
-2:9 ERROR @Log is legal only on types.
\ No newline at end of file
+2:9 @Log is legal only on types.
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages
index ba97e38f..a525dd27 100644
--- a/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages
+++ b/test/transform/resource/messages-delombok/LoggerSlf4jTypes.java.messages
@@ -1,2 +1,2 @@
-1:1 ERROR @Log is legal only on classes and enums.
-4:1 ERROR @Log is legal only on classes and enums.
\ No newline at end of file
+1:1 @Log is legal only on classes and enums.
+4:1 @Log is legal only on classes and enums.
\ 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 99dd1d25..9cece93c 100644
--- a/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages
+++ b/test/transform/resource/messages-delombok/SetterAlreadyExists.java.messages
@@ -1,7 +1,7 @@
-2:9 WARNING Not generating setFoo(): A method with that name already exists
-8:9 WARNING Not generating setFoo(): A method with that name already exists
-14:9 WARNING Not generating setFoo(): A method with that name already exists
-20:9 WARNING Not generating setFoo(): A method with that name already exists
-38:9 WARNING Not generating setFoo(): A method with that name already exists
-44:9 WARNING Not generating setFoo(): A method with that name already exists (setIsFoo)
-50:9 WARNING Not generating setFoo(): A method with that name already exists
+2:9 Not generating setFoo(): A method with that name already exists
+8:9 Not generating setFoo(): A method with that name already exists
+14:9 Not generating setFoo(): A method with that name already exists
+20:9 Not generating setFoo(): A method with that name already exists
+38:9 Not generating setFoo(): A method with that name already exists
+44:9 Not generating setFoo(): A method with that name already exists (setIsFoo)
+50:9 Not generating setFoo(): A method with that name already exists
diff --git a/test/transform/resource/messages-delombok/SetterOnMethod.java.messages b/test/transform/resource/messages-delombok/SetterOnMethod.java.messages
index 2df11f97..9473d5b3 100644
--- a/test/transform/resource/messages-delombok/SetterOnMethod.java.messages
+++ b/test/transform/resource/messages-delombok/SetterOnMethod.java.messages
@@ -1,17 +1,7 @@
-3:34 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Setter.AnyAnnotation
-4:44 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Setter.AnyAnnotation
-6:26 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Setter.AnyAnnotation
-11:26 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Setter.AnyAnnotation
-14:44 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Setter.AnyAnnotation
-6:1 ERROR 'onMethod' is not supported for @Setter on a type.
-11:1 ERROR 'onMethod' is not supported for @Setter on a type.
+3:34 incompatible types
+4:44 incompatible types
+6:26 incompatible types
+11:26 incompatible types
+14:44 incompatible types
+6:1 'onMethod' is not supported for @Setter on a type.
+11:1 'onMethod' is not supported for @Setter on a type.
diff --git a/test/transform/resource/messages-delombok/SetterOnParam.java.messages b/test/transform/resource/messages-delombok/SetterOnParam.java.messages
index a18f1b83..b8c69eca 100644
--- a/test/transform/resource/messages-delombok/SetterOnParam.java.messages
+++ b/test/transform/resource/messages-delombok/SetterOnParam.java.messages
@@ -1,17 +1,7 @@
-3:33 ERROR incompatible types
-found   : java.lang.SuppressWarnings
-required: lombok.Setter.AnyAnnotation
-4:43 ERROR incompatible types
-found   : java.lang.SuppressWarnings
-required: lombok.Setter.AnyAnnotation
-6:25 ERROR incompatible types
-found   : java.lang.SuppressWarnings
-required: lombok.Setter.AnyAnnotation
-11:25 ERROR incompatible types
-found   : java.lang.SuppressWarnings
-required: lombok.Setter.AnyAnnotation
-14:43 ERROR incompatible types
-found   : java.lang.SuppressWarnings
-required: lombok.Setter.AnyAnnotation
-6:1 ERROR 'onParam' is not supported for @Setter on a type.
-11:1 ERROR 'onParam' is not supported for @Setter on a type.
+3:33 incompatible types
+4:43 incompatible types
+6:25 incompatible types
+11:25 incompatible types
+14:43 incompatible types
+6:1 'onParam' is not supported for @Setter on a type.
+11:1 'onParam' is not supported for @Setter on a type.
diff --git a/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages b/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages
index b247b624..7324f6f3 100644
--- a/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages
+++ b/test/transform/resource/messages-delombok/SetterOnParamAndOnMethod.java.messages
@@ -1,6 +1,2 @@
-2:34 ERROR incompatible types
-found   : java.lang.Deprecated
-required: lombok.Setter.AnyAnnotation
-2:54 ERROR incompatible types
-found   : java.lang.SuppressWarnings
-required: lombok.Setter.AnyAnnotation
\ No newline at end of file
+2:34 incompatible types
+2:54 incompatible types
diff --git a/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages b/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages
index 3a345d06..7acd35ed 100644
--- a/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages
+++ b/test/transform/resource/messages-delombok/SimpleTypeResolution.java.messages
@@ -1,9 +1 @@
-2:10 ERROR cannot find symbol
-symbol  : class Getter
-location: class SimpleTypeResolutionFail
-2:10 ERROR cannot find symbol
-symbol  : class Getter
-location: class SimpleTypeResolutionFail
-2:10 ERROR cannot find symbol
-symbol  : class Getter
-location: class SimpleTypeResolutionFail
+2:10 cannot find symbol
diff --git a/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages b/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages
index bffd29e6..f282d34d 100644
--- a/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages
+++ b/test/transform/resource/messages-delombok/SynchronizedNameNoSuchField.java.messages
@@ -1 +1 @@
-5:9 ERROR The field write does not exist.
+5:9 The field write does not exist.
diff --git a/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages b/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages
index 84336ebb..5d6bc958 100644
--- a/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages
+++ b/test/transform/resource/messages-delombok/SynchronizedNameStaticToInstanceRef.java.messages
@@ -1 +1 @@
-5:9 ERROR non-static variable read cannot be referenced from a static context
\ No newline at end of file
+5:9 non-static variable read cannot be referenced from a static context
\ No newline at end of file
diff --git a/test/transform/resource/messages-delombok/ValErrors.java.messages b/test/transform/resource/messages-delombok/ValErrors.java.messages
index bd59ad3b..887b8c21 100644
--- a/test/transform/resource/messages-delombok/ValErrors.java.messages
+++ b/test/transform/resource/messages-delombok/ValErrors.java.messages
@@ -1,2 +1,2 @@
-5:21 ERROR Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved
-9:21 ERROR 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })
+5:21 Cannot use 'val' here because initializer expression does not have a representable type: Type cannot be resolved
+9:21 'val' is not compatible with array initializer expressions. Use the full form (new int[] { ... } instead of just { ... })
diff --git a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages
index 3f7ada73..b69a4a13 100644
--- a/test/transform/resource/messages-delombok/ValInBasicFor.java.messages
+++ b/test/transform/resource/messages-delombok/ValInBasicFor.java.messages
@@ -1,3 +1,3 @@
-6:26 ERROR 'val' is not allowed in old-style for loops
-6:40 ERROR 'val' is not allowed in old-style for loops
-6:53 ERROR 'val' is not allowed in old-style for loops
+6:26 'val' is not allowed in old-style for loops
+6:40 'val' is not allowed in old-style for loops
+6:53 'val' is not allowed in old-style for loops
diff --git a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages b/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages
index 4a5dd9d1..b68f6398 100644
--- a/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages
+++ b/test/transform/resource/messages-delombok/WitherAlreadyExists.java.messages
@@ -1,7 +1,7 @@
-2:9 WARNING Not generating withFoo(): A method with that name already exists
-12:9 WARNING Not generating withFoo(): A method with that name already exists
-22:9 WARNING Not generating withFoo(): A method with that name already exists
-32:9 WARNING Not generating withFoo(): A method with that name already exists
-62:9 WARNING Not generating withFoo(): A method with that name already exists
-72:9 WARNING Not generating withFoo(): A method with that name already exists (withIsFoo)
-82:9 WARNING Not generating withFoo(): A method with that name already exists
+2:9 Not generating withFoo(): A method with that name already exists
+12:9 Not generating withFoo(): A method with that name already exists
+22:9 Not generating withFoo(): A method with that name already exists
+32:9 Not generating withFoo(): A method with that name already exists
+62:9 Not generating withFoo(): A method with that name already exists
+72:9 Not generating withFoo(): A method with that name already exists (withIsFoo)
+82:9 Not generating withFoo(): A method with that name already exists
diff --git a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages
index e9e94e5f..9dd69e75 100644
--- a/test/transform/resource/messages-delombok/WitherOnStatic.java.messages
+++ b/test/transform/resource/messages-delombok/WitherOnStatic.java.messages
@@ -1,2 +1,2 @@
-2:9 WARNING Not generating wither for this field: Withers cannot be generated for static fields.
-3:9 WARNING Not generating wither for this field: Withers cannot be generated for static fields.
+2:9 Not generating wither for this field: Withers cannot be generated for static fields.
+3:9 Not generating wither for this field: Withers cannot be generated for static fields.
diff --git a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages
index 34f34969..74eeabba 100644
--- a/test/transform/resource/messages-delombok/WitherWithDollar.java.messages
+++ b/test/transform/resource/messages-delombok/WitherWithDollar.java.messages
@@ -1 +1 @@
-2:9 WARNING Not generating wither for this field: Withers cannot be generated for fields starting with $.
+2:9 Not generating wither for this field: Withers cannot be generated for fields starting with $.