changeset 2337:abddf1820015

Adapt expected output to improved error messages.
author wmdietl
date Wed, 20 Mar 2013 15:00:49 +0100
parents 35fca9f10e60
children b066dc51366f
files test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out
diffstat 3 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out	Wed Mar 20 14:59:56 2013 +0100
+++ b/test/tools/javac/annotations/typeAnnotations/failures/StaticMethods.out	Wed Mar 20 15:00:49 2013 +0100
@@ -1,2 +1,2 @@
-StaticMethods.java:9:34: compiler.err.receiver.parameter.not.applicable
+StaticMethods.java:9:34: compiler.err.receiver.parameter.not.applicable.static: StaticMethods this
 1 error
\ No newline at end of file
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out	Wed Mar 20 14:59:56 2013 +0100
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/StaticThings.out	Wed Mar 20 15:00:49 2013 +0100
@@ -1,5 +1,5 @@
-StaticThings.java:52:32: compiler.err.receiver.parameter.not.applicable
-StaticThings.java:54:37: compiler.err.receiver.parameter.not.applicable
-StaticThings.java:33:26: compiler.err.receiver.parameter.not.applicable
-StaticThings.java:36:28: compiler.err.receiver.parameter.not.applicable
+StaticThings.java:52:32: compiler.err.receiver.parameter.not.applicable.static: Nested2 this
+StaticThings.java:54:37: compiler.err.receiver.parameter.not.applicable.static: Test.Nested2 this
+StaticThings.java:33:26: compiler.err.receiver.parameter.not.applicable.static: Test this
+StaticThings.java:36:28: compiler.err.receiver.parameter.not.applicable.static: Test this
 4 errors
\ No newline at end of file
--- a/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out	Wed Mar 20 14:59:56 2013 +0100
+++ b/test/tools/javac/annotations/typeAnnotations/failures/common/receiver/WrongType.out	Wed Mar 20 15:00:49 2013 +0100
@@ -1,9 +1,9 @@
 WrongType.java:55:15: compiler.err.cant.resolve.location: kindname.class, XYZ, , , (compiler.misc.location: kindname.class, WrongType, null)
 WrongType.java:65:27: compiler.err.doesnt.exist: Outer
 WrongType.java:66:31: compiler.err.cant.resolve.location: kindname.class, XY, , , (compiler.misc.location: kindname.class, WrongType, null)
-WrongType.java:48:23: compiler.err.incorrect.receiver.type
-WrongType.java:50:23: compiler.err.incorrect.receiver.type
-WrongType.java:63:33: compiler.err.incorrect.receiver.type
-WrongType.java:64:31: compiler.err.incorrect.receiver.type
-WrongType.java:70:28: compiler.err.incorrect.receiver.type
+WrongType.java:48:23: compiler.err.incorrect.receiver.type: WrongType, (@A :: java.lang.Object)
+WrongType.java:50:23: compiler.err.incorrect.receiver.type: WrongType, (@A :: java.lang.Object)
+WrongType.java:63:33: compiler.err.incorrect.receiver.type: WrongType.Inner, (@A :: WrongType)
+WrongType.java:64:31: compiler.err.incorrect.receiver.type: WrongType.Inner, (@A :: java.lang.Object)
+WrongType.java:70:28: compiler.err.incorrect.receiver.type: WrongType.Generics<X>, WrongType.Generics<Y>
 8 errors
\ No newline at end of file