test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java

*** 42,53 ****
  package compiler.jvmci.compilerToVM;
  
  import java.util.HashMap;
  import java.util.Map;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
! import jdk.vm.ci.hotspot.HotSpotConstantPool;
! import jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl;
  import sun.reflect.ConstantPool;
  
  /**
   * Test for {@code compiler.jvmci.CompilerToVM.resolveTypeInPool} method
   */
--- 42,52 ----
  package compiler.jvmci.compilerToVM;
  
  import java.util.HashMap;
  import java.util.Map;
  import jdk.vm.ci.hotspot.CompilerToVMHelper;
! import jdk.vm.ci.hotspot.HotSpotResolvedObjectType;
  import sun.reflect.ConstantPool;
  
  /**
   * Test for {@code compiler.jvmci.CompilerToVM.resolveTypeInPool} method
   */
*** 60,73 ****
                  ResolveTypeInPoolTest::validate);
          ConstantPoolTestCase testCase = new ConstantPoolTestCase(typeTests);
          testCase.test();
      }
  
!     public static void validate(HotSpotConstantPool constantPoolCTVM,
              ConstantPool constantPoolSS,
              ConstantPoolTestsHelper.DummyClasses dummyClass, int i) {
!         HotSpotResolvedObjectTypeImpl typeToVerify = CompilerToVMHelper
                  .resolveTypeInPool(constantPoolCTVM, i);
          int classNameIndex = (int) dummyClass.cp.get(i).value;
          String classNameToRefer = constantPoolSS.getUTF8At(classNameIndex);
          String outputToVerify = typeToVerify.toString();
          if (!outputToVerify.contains(classNameToRefer)) {
--- 59,73 ----
                  ResolveTypeInPoolTest::validate);
          ConstantPoolTestCase testCase = new ConstantPoolTestCase(typeTests);
          testCase.test();
      }
  
!     public static void validate(
!             jdk.vm.ci.meta.ConstantPool constantPoolCTVM,
              ConstantPool constantPoolSS,
              ConstantPoolTestsHelper.DummyClasses dummyClass, int i) {
!         HotSpotResolvedObjectType typeToVerify = CompilerToVMHelper
                  .resolveTypeInPool(constantPoolCTVM, i);
          int classNameIndex = (int) dummyClass.cp.get(i).value;
          String classNameToRefer = constantPoolSS.getUTF8At(classNameIndex);
          String outputToVerify = typeToVerify.toString();
          if (!outputToVerify.contains(classNameToRefer)) {