From 8cb91c890d6c9d76bc0c6e7421f65b51bd4defbe Mon Sep 17 00:00:00 2001 From: Kumar Srinivasan Date: Thu, 20 Mar 2008 08:44:18 -0700 Subject: [PATCH] 6618930: (javac) fix test after whitespace normalization Whitespace normalization left the test unusable, back to service Reviewed-by: jjg --- langtools/test/tools/javac/6304921/T6304921.java | 2 -- langtools/test/tools/javac/6304921/T6304921.out | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/langtools/test/tools/javac/6304921/T6304921.java b/langtools/test/tools/javac/6304921/T6304921.java index 609110e679d..061817dcaa5 100644 --- a/langtools/test/tools/javac/6304921/T6304921.java +++ b/langtools/test/tools/javac/6304921/T6304921.java @@ -1,8 +1,6 @@ /* * @test (important: no SCCS keywords to affect offsets in golden file.) /nodynamiccopyright/ * @bug 6304921 - * @ignore - * Need to fix this test post whitespace normalization * @compile/fail/ref=T6304921.out -XDstdout -XDcompilePolicy=bytodo -XDdiags=%b:%s/%o/%e:%_%t%m|%p%m -Xjcov -Xlint:all,-path -Werror T6304921.java */ diff --git a/langtools/test/tools/javac/6304921/T6304921.out b/langtools/test/tools/javac/6304921/T6304921.out index 10340e25fd2..32218acc586 100644 --- a/langtools/test/tools/javac/6304921/T6304921.out +++ b/langtools/test/tools/javac/6304921/T6304921.out @@ -1,20 +1,20 @@ -T6304921.java:569/569/584: warning: [unchecked] unchecked conversion +T6304921.java:667/667/682: warning: [unchecked] unchecked conversion found : java.util.ArrayList required: java.util.List List list = new ArrayList(); ^ -T6304921.java:410/410/418: warning: [fallthrough] possible fall-through into case +T6304921.java:445/445/453: warning: [fallthrough] possible fall-through into case default: ^ -T6304921.java:452/522/523: warning: [finally] finally clause cannot complete normally +T6304921.java:522/613/614: warning: [finally] finally clause cannot complete normally } ^ -T6304921.java:622/628/632: cannot find symbol +T6304921.java:727/733/737: cannot find symbol symbol : variable orr location: class java.lang.System System.orr.println("abc"); // name not found ^ -T6304921.java:700/704/710: operator + cannot be applied to int,boolean +T6304921.java:812/816/822: operator + cannot be applied to int,boolean return 123 + true; // bad binary expression ^ 2 errors