OpenJDK / portola / portola
changeset 27850:d27ca106daa4
8065054: Some tests have junk before the legal header
Reviewed-by: darcy
author | jjg |
---|---|
date | Thu, 20 Nov 2014 14:23:31 -0800 |
parents | df6cd9799fcd |
children | 5f28577d20f6 |
files | langtools/test/tools/javac/T6181889/EmptyFinallyTest.java langtools/test/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java langtools/test/tools/javac/VersionOpt.java langtools/test/tools/javac/annotations/typeAnnotations/InnerClass.java langtools/test/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java langtools/test/tools/javac/main/Option_J_At_Test.java langtools/test/tools/javac/processing/model/util/elements/Foo.java |
diffstat | 7 files changed, 7 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/test/tools/javac/T6181889/EmptyFinallyTest.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/T6181889/EmptyFinallyTest.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,8 +1,3 @@ - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.nio.file.Paths; - /* * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +27,10 @@ * @summary Empty try/finally results in bytecodes being generated */ +import java.io.PrintWriter; +import java.io.StringWriter; +import java.nio.file.Paths; + public class EmptyFinallyTest { private static final String assertionErrorMsg = "No \"Exception table\" should be generated in this case";
--- a/langtools/test/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,4 +1,3 @@ - /* * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/langtools/test/tools/javac/VersionOpt.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/VersionOpt.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,4 +1,3 @@ - /* * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/langtools/test/tools/javac/annotations/typeAnnotations/InnerClass.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/annotations/typeAnnotations/InnerClass.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,5 +1,3 @@ -import java.lang.annotation.ElementType; - /* * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/BasicTest.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,4 +1,3 @@ - /* * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/langtools/test/tools/javac/main/Option_J_At_Test.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/main/Option_J_At_Test.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,7 +1,3 @@ - -import java.io.PrintWriter; -import java.io.StringWriter; - /* * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,6 +27,9 @@ * @summary extra space in javac -help for -J and @ options */ +import java.io.PrintWriter; +import java.io.StringWriter; + public class Option_J_At_Test { public static void main(String... args) throws Exception { new Option_J_At_Test().run();
--- a/langtools/test/tools/javac/processing/model/util/elements/Foo.java Thu Nov 20 14:05:39 2014 -0800 +++ b/langtools/test/tools/javac/processing/model/util/elements/Foo.java Thu Nov 20 14:23:31 2014 -0800 @@ -1,4 +1,3 @@ - /* * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.