test/jdk/java/lang/ModuleTests/AnnotationsTest.java

rev 47454 : [mq]: jdk-new-asm-test.patch

*** 32,55 ****
  
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Set;
  
- import jdk.internal.module.ClassFileAttributes;
  import jdk.internal.org.objectweb.asm.AnnotationVisitor;
  import jdk.internal.org.objectweb.asm.Attribute;
  import jdk.internal.org.objectweb.asm.ClassReader;
  import jdk.internal.org.objectweb.asm.ClassVisitor;
  import jdk.internal.org.objectweb.asm.ClassWriter;
  import jdk.internal.org.objectweb.asm.Opcodes;
  
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
  /**
   * @test
   * @modules java.base/jdk.internal.org.objectweb.asm
   *          java.base/jdk.internal.module
   *          java.xml
   * @run testng AnnotationsTest
   * @summary Basic test of annotations on modules
   */
--- 32,56 ----
  
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Set;
  
  import jdk.internal.org.objectweb.asm.AnnotationVisitor;
  import jdk.internal.org.objectweb.asm.Attribute;
  import jdk.internal.org.objectweb.asm.ClassReader;
  import jdk.internal.org.objectweb.asm.ClassVisitor;
  import jdk.internal.org.objectweb.asm.ClassWriter;
  import jdk.internal.org.objectweb.asm.Opcodes;
+ import jdk.internal.org.objectweb.asm.commons.ModuleTargetAttribute;
  
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
  /**
   * @test
   * @modules java.base/jdk.internal.org.objectweb.asm
+  *          java.base/jdk.internal.org.objectweb.asm.commons
   *          java.base/jdk.internal.module
   *          java.xml
   * @run testng AnnotationsTest
   * @summary Basic test of annotations on modules
   */
*** 111,128 ****
  
          try (in) {
              ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
                                               + ClassWriter.COMPUTE_FRAMES);
  
!             ClassVisitor cv = new ClassVisitor(Opcodes.ASM5, cw) { };
  
              ClassReader cr = new ClassReader(in);
- 
              List<Attribute> attrs = new ArrayList<>();
!             attrs.add(new ClassFileAttributes.ModuleAttribute());
!             attrs.add(new ClassFileAttributes.ModulePackagesAttribute());
!             attrs.add(new ClassFileAttributes.ModuleTargetAttribute());
              cr.accept(cv, attrs.toArray(new Attribute[0]), 0);
  
              AnnotationVisitor annotationVisitor
                  = cv.visitAnnotation("Ljava/lang/Deprecated;", true);
              annotationVisitor.visit("forRemoval", forRemoval);
--- 112,126 ----
  
          try (in) {
              ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS
                                               + ClassWriter.COMPUTE_FRAMES);
  
!             ClassVisitor cv = new ClassVisitor(Opcodes.ASM6, cw) { };
  
              ClassReader cr = new ClassReader(in);
              List<Attribute> attrs = new ArrayList<>();
!             attrs.add(new ModuleTargetAttribute());
              cr.accept(cv, attrs.toArray(new Attribute[0]), 0);
  
              AnnotationVisitor annotationVisitor
                  = cv.visitAnnotation("Ljava/lang/Deprecated;", true);
              annotationVisitor.visit("forRemoval", forRemoval);