archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8313422: test/langtools/tools/javac 144 test classes uses com.sun.tools.classfile library

Browse source 
Reviewed-by: asotona
This commit is contained in:
Qing Xiao 2023-09-07 15:37:25 +00:00 • committed by Adam Sotona
parent 8557205a82
commit 8f7e29b2cd
144 changed files with 2743 additions and 2762 deletions
Download patch file Download diff file Expand all files Collapse all files

59
test/langtools/tools/javac/modules/AnnotationsOnModules.java
View file

@ -28,7 +28,12 @@
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.classfile
* java.base/jdk.internal.classfile
* java.base/jdk.internal.classfile.attribute
* java.base/jdk.internal.classfile.constantpool
* java.base/jdk.internal.classfile.instruction
* java.base/jdk.internal.classfile.components
* java.base/jdk.internal.classfile.impl
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
* @run main AnnotationsOnModules
*/
@ -51,11 +56,9 @@ import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.TypeElement;
import com.sun.tools.classfile.Annotation;
import com.sun.tools.classfile.Attribute;
import com.sun.tools.classfile.ClassFile;
import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute;
import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute;
import jdk.internal.classfile.*;
import jdk.internal.classfile.Classfile;
import jdk.internal.classfile.attribute.*;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.Task.OutputKind;
@ -86,10 +89,10 @@ public class AnnotationsOnModules extends ModuleTestBase {
.run()
.writeAll();
ClassFile cf = ClassFile.read(modulePath.resolve("m1x").resolve("module-info.class"));
RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations);
ClassModel cf = Classfile.of().parse(modulePath.resolve("m1x").resolve("module-info.class"));
RuntimeVisibleAnnotationsAttribute annotations = cf.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
if (annotations == null || annotations.annotations.length != 1) {
if (annotations == null || annotations.annotations().size() != 1) {
throw new AssertionError("Annotations not correct!");
}
}
@ -140,14 +143,14 @@ public class AnnotationsOnModules extends ModuleTestBase {
throw new AssertionError("Output is not empty. Expected no output and no warnings.");
}
ClassFile cf = ClassFile.read(modulePath.resolve("A").resolve("module-info.class"));
RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations);
ClassModel cf = Classfile.of().parse(modulePath.resolve("A").resolve("module-info.class"));
RuntimeVisibleAnnotationsAttribute annotations = cf.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
if (annotations != null && annotations.annotations.length > 0) {
if (annotations != null && annotations.annotations().size() > 0) {
throw new AssertionError("Found annotation attributes. Expected no annotations for javadoc @deprecated tag.");
}
if (cf.attributes.map.get(Attribute.Deprecated) != null) {
if (cf.findAttribute(Attributes.DEPRECATED).isPresent()) {
throw new AssertionError("Found Deprecated attribute. Expected no Deprecated attribute for javadoc @deprecated tag.");
}
}
@ -191,17 +194,17 @@ public class AnnotationsOnModules extends ModuleTestBase {
throw new AssertionError("Expected output not found. Expected: " + expected);
}
ClassFile cf = ClassFile.read(modulePath.resolve("A").resolve("module-info.class"));
RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations);
ClassModel cf = Classfile.of().parse(modulePath.resolve("A").resolve("module-info.class"));
RuntimeVisibleAnnotationsAttribute annotations = cf.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
if (annotations == null ) {
throw new AssertionError("Annotations not found!");
}
int length = annotations.annotations.length;
int length = annotations.annotations().size();
if (length != 1 ) {
throw new AssertionError("Incorrect number of annotations: " + length);
}
int pairsCount = annotations.annotations[0].num_element_value_pairs;
int pairsCount = annotations.annotations().get(0).elements().size();
if (pairsCount != 2) {
throw new AssertionError("Incorrect number of key-value pairs in annotation: " + pairsCount + " Expected two: forRemoval and since.");
}
@ -314,10 +317,10 @@ public class AnnotationsOnModules extends ModuleTestBase {
.run()
.writeAll();
ClassFile cf = ClassFile.read(modulePath.resolve("m1x").resolve("module-info.class"));
RuntimeInvisibleAnnotations_attribute annotations = (RuntimeInvisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeInvisibleAnnotations);
ClassModel cf = Classfile.of().parse(modulePath.resolve("m1x").resolve("module-info.class"));
RuntimeInvisibleAnnotationsAttribute annotations = cf.findAttribute(Attributes.RUNTIME_INVISIBLE_ANNOTATIONS).orElse(null);
if (annotations == null || annotations.annotations.length != 1) {
if (annotations == null || annotations.annotations().size() != 1) {
throw new AssertionError("Annotations not correct!");
}
}
@ -356,13 +359,13 @@ public class AnnotationsOnModules extends ModuleTestBase {
.run()
.writeAll();
ClassFile cf = ClassFile.read(modulePath.resolve("B").resolve("module-info.class"));
RuntimeInvisibleAnnotations_attribute annotations = (RuntimeInvisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeInvisibleAnnotations);
ClassModel cf = Classfile.of().parse(modulePath.resolve("B").resolve("module-info.class"));
RuntimeInvisibleAnnotationsAttribute annotations = cf.findAttribute(Attributes.RUNTIME_INVISIBLE_ANNOTATIONS).orElse(null);
if (annotations == null ) {
throw new AssertionError("Annotations not found!");
}
int length = annotations.annotations.length;
int length = annotations.annotations().size();
if (length != 2 ) {
throw new AssertionError("Incorrect number of annotations: " + length);
}
@ -431,18 +434,18 @@ public class AnnotationsOnModules extends ModuleTestBase {
.run()
.writeAll();
ClassFile cf = ClassFile.read(classes.resolve("m1x").resolve("module-info.class"));
var invisibleAnnotations = (RuntimeInvisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeInvisibleAnnotations);
ClassModel cf = Classfile.of().parse(classes.resolve("m1x").resolve("module-info.class"));
RuntimeInvisibleAnnotationsAttribute invisibleAnnotations = cf.findAttribute(Attributes.RUNTIME_INVISIBLE_ANNOTATIONS).orElse(null);
if (invisibleAnnotations == null) {
throw new AssertionError("Annotations not found!");
}
int length = invisibleAnnotations.annotations.length;
int length = invisibleAnnotations.annotations().size();
if (length != 1) {
throw new AssertionError("Incorrect number of annotations: " + length);
}
Annotation annotation = invisibleAnnotations.annotations[0];
String annotationName = cf.constant_pool.getUTF8Value(annotation.type_index).toString();
Annotation annotation = invisibleAnnotations.annotations().get(0);
String annotationName = annotation.classSymbol().descriptorString();
if (!"Ltest/A;".equals(annotationName)) {
throw new AssertionError("Incorrect annotation name: " + annotationName);
}