infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-23 00:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

8051768: Inconsistent output for Visible and InvisibleParameterAnnotations

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Denis Istomin 2017-01-24 16:18:24 -08:00 committed by Jonathan Gibbons
parent 8e3182c384
commit 31b1a86ec6
2 changed files with 97 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -56,6 +56,7 @@ import com.sun.tools.classfile.ModuleTarget_attribute;
import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute;
import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute;
import com.sun.tools.classfile.RuntimeParameterAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleParameterAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleTypeAnnotations_attribute;
@ -764,9 +765,8 @@ public class AttributeWriter extends BasicWriter
return null;
}
@Override
public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, Void ignore) {
println("RuntimeVisibleParameterAnnotations:");
private void visitParameterAnnotations(String message, RuntimeParameterAnnotations_attribute attr) {
println(message);
indent(+1);
for (int param = 0; param < attr.parameter_annotations.length; param++) {
println("parameter " + param + ": ");
@ -779,24 +779,17 @@ public class AttributeWriter extends BasicWriter
indent(-1);
}
indent(-1);
}
@Override
public Void visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, Void ignore) {
visitParameterAnnotations("RuntimeVisibleParameterAnnotations:", (RuntimeParameterAnnotations_attribute) attr);
return null;
}
@Override
public Void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisibleParameterAnnotations_attribute attr, Void ignore) {
println("RuntimeInvisibleParameterAnnotations:");
indent(+1);
for (int param = 0; param < attr.parameter_annotations.length; param++) {
println(param + ": ");
indent(+1);
for (int i = 0; i < attr.parameter_annotations[param].length; i++) {
print(i + ": ");
annotationWriter.write(attr.parameter_annotations[param][i]);
println();
}
indent(-1);
}
indent(-1);
visitParameterAnnotations("RuntimeInvisibleParameterAnnotations:", (RuntimeParameterAnnotations_attribute) attr);
return null;
}

87
langtools/test/tools/javap/typeAnnotations/InvisibleParameterAnnotationsTest.java Normal file
View File

@ -0,0 +1,87 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8051768
* @summary Verify that javap prints "param" for RuntimeInvisibleParameterAnnotations
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build toolbox.ToolBox toolbox.JavacTask toolbox.JavapTask toolbox.Assert
* @run main InvisibleParameterAnnotationsTest
*/
import toolbox.Assert;
import toolbox.JavacTask;
import toolbox.JavapTask;
import toolbox.Task;
import toolbox.ToolBox;
import java.util.Collections;
import java.util.List;
public class InvisibleParameterAnnotationsTest {
private static final String TestSrc =
"import java.lang.annotation.Retention \n;" +
"import java.lang.annotation.RetentionPolicy \n;" +
"public class Sample { \n" +
"@Retention(RetentionPolicy.CLASS) \n" +
"public @interface InvisAnno{} \n" +
"@Retention(RetentionPolicy.RUNTIME) \n" +
"public @interface VisAnno{} \n" +
"public void Method(@InvisAnno int arg1,@VisAnno int arg2){};" +
"}";
private static final String ExpectedSubstring =
" RuntimeVisibleParameterAnnotations:\n" +
" parameter 0:\n" +
" parameter 1:\n" +
" 0: #16()\n" +
" RuntimeInvisibleParameterAnnotations:\n" +
" parameter 0:\n" +
" 0: #18()\n" +
" parameter 1:";
public static void main(String[] args) throws Exception {
ToolBox tb = new ToolBox();
new JavacTask(tb).sources(TestSrc).run();
List<String> res = new JavapTask(tb)
.options("-v")
.classes("Sample.class")
.run()
.getOutputLines(Task.OutputKind.DIRECT);
List<String> expectedList = tb.split(ExpectedSubstring, "\n");
Boolean found = Collections.indexOfSubList(res, expectedList) > -1;
Assert.check(found, "expected output not found: " + ExpectedSubstring);
}
}