test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java

*** 19,34 ****
   * 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 jdk.vm.ci.hotspot.test.HotSpotConstantReflectionProviderTest
   * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
   * @modules jdk.vm.ci/jdk.vm.ci.runtime
   *          jdk.vm.ci/jdk.vm.ci.meta
!  *          jdk.vm.ci/jdk.vm.ci.hotspot
   *          java.base/jdk.internal.vm.annotation
   *          java.base/jdk.internal.misc
   * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
   * @build jdk.vm.ci.hotspot.test.DummyClass
   * @run driver ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass
--- 19,34 ----
   * 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 jdk.vm.ci.hotspot.test.HotSpotConstantReflectionProviderTest
   * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
   * @modules jdk.vm.ci/jdk.vm.ci.runtime
   *          jdk.vm.ci/jdk.vm.ci.meta
!  *          jdk.vm.ci.hotspot/jdk.vm.ci.hotspot
   *          java.base/jdk.internal.vm.annotation
   *          java.base/jdk.internal.misc
   * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
   * @build jdk.vm.ci.hotspot.test.DummyClass
   * @run driver ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass
*** 93,121 ****
          JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
          Assert.assertEquals(actual == null ? "null" : actual.toString(),
                              expected == null ? "null" : expected.toString(), "Unexpected result:");
      }
  
!     @Test(dataProvider = "readFieldValueNegativeDataProvider",
!             dataProviderClass = ReadFieldValueDataProvider.class,
!             expectedExceptions = {NullPointerException.class})
      public void testNegativeReadFieldValue(ResolvedJavaField field, JavaConstant receiver) {
          CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
      }
  
!     @Test(dataProvider = "readStableFieldValueDataProvider",
!             dataProviderClass = ReadStableFieldValueDataProvider.class)
      public void testReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
                                           JavaConstant expected) {
          Assert.assertEquals(
                  CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab),
                  expected,
                  "Unexpected result:");
      }
  
!     @Test(dataProvider = "readStableFieldValueArrayDataProvider",
!             dataProviderClass = ReadStableFieldValueDataProvider.class)
      public void testReadStableFieldValueForArray(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
                                                   int arrayDim, JavaConstant expected) {
          JavaConstant result = CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver,
                                                                                  isDefStab);
          boolean resultDefStab = false;
--- 93,117 ----
          JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
          Assert.assertEquals(actual == null ? "null" : actual.toString(),
                          expected == null ? "null" : expected.toString(), "Unexpected result:");
      }
  
!     @Test(dataProvider = "readFieldValueNegativeDataProvider", dataProviderClass = ReadFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
      public void testNegativeReadFieldValue(ResolvedJavaField field, JavaConstant receiver) {
          CONSTANT_REFLECTION_PROVIDER.readFieldValue(field, receiver);
      }
  
!     @Test(dataProvider = "readStableFieldValueDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class)
      public void testReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
                      JavaConstant expected) {
          Assert.assertEquals(
                          CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab),
                          expected,
                          "Unexpected result:");
      }
  
!     @Test(dataProvider = "readStableFieldValueArrayDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class)
      public void testReadStableFieldValueForArray(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab,
                      int arrayDim, JavaConstant expected) {
          JavaConstant result = CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver,
                          isDefStab);
          boolean resultDefStab = false;
*** 139,183 ****
          Assert.assertEquals(resultStableDim, arrayDim,
                              "Wrong array dimension for " + result.toString());
          Assert.assertEquals(result.toString(), expected.toString(), "Unexpected result:");
      }
  
!     @Test(dataProvider = "readStableFieldValueNegativeDataProvider",
!             dataProviderClass = ReadStableFieldValueDataProvider.class,
!             expectedExceptions = {NullPointerException.class})
      public void testNegativeReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab) {
          CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab);
      }
  
!     @Test(dataProvider = "readConstantFieldValueDataProvider",
!             dataProviderClass = ReadConstantFieldValueDataProvider.class)
      public void testReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver, JavaConstant expected,
                                             String testInfo) {
          String msg = String.format("Unexpected result for %s. Field is stable = %s.", testInfo,
                                     ((HotSpotResolvedJavaField) field).isStable());
          Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver),
                              expected, msg);
      }
  
!     @Test(dataProvider = "readConstantFieldValueNegativeDataProvider",
!             dataProviderClass = ReadConstantFieldValueDataProvider.class,
!             expectedExceptions = {NullPointerException.class})
      public void testNegativeReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
          CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver);
      }
  
!     @Test(dataProvider = "readConstantArrayElementDataProvider",
!             dataProviderClass = ReadConstantArrayElementDataProvider.class)
      public void testReadConstantArrayElement(JavaConstant array, int index, JavaConstant expected, String testInfo) {
          JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElement(array, index);
          Assert.assertEquals(actual == null ? "null" : actual.toString(),
                              expected == null ? "null" : expected.toString(),
                              String.format("Unexpected result while testing %s:", testInfo));
      }
  
!     @Test(dataProvider = "readConstantArrayElementForOffsetDataProvider",
!             dataProviderClass = ReadConstantArrayElementDataProvider.class)
      public void testReadConstantArrayElementForOffset(JavaConstant array, long offset, JavaConstant expected,
                                                        String testInfo) {
          JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElementForOffset(array,
                                                                                               offset);
          Assert.assertEquals(actual == null ? "null" : actual.toString(),
--- 135,172 ----
          Assert.assertEquals(resultStableDim, arrayDim,
                          "Wrong array dimension for " + result.toString());
          Assert.assertEquals(result.toString(), expected.toString(), "Unexpected result:");
      }
  
!     @Test(dataProvider = "readStableFieldValueNegativeDataProvider", dataProviderClass = ReadStableFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
      public void testNegativeReadStableFieldValue(ResolvedJavaField field, JavaConstant receiver, boolean isDefStab) {
          CONSTANT_REFLECTION_PROVIDER.readStableFieldValue(field, receiver, isDefStab);
      }
  
!     @Test(dataProvider = "readConstantFieldValueDataProvider", dataProviderClass = ReadConstantFieldValueDataProvider.class)
      public void testReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver, JavaConstant expected,
                      String testInfo) {
          String msg = String.format("Unexpected result for %s. Field is stable = %s.", testInfo,
                          ((HotSpotResolvedJavaField) field).isStable());
          Assert.assertEquals(CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver),
                          expected, msg);
      }
  
!     @Test(dataProvider = "readConstantFieldValueNegativeDataProvider", dataProviderClass = ReadConstantFieldValueDataProvider.class, expectedExceptions = {NullPointerException.class})
      public void testNegativeReadConstantFieldValue(ResolvedJavaField field, JavaConstant receiver) {
          CONSTANT_REFLECTION_PROVIDER.readConstantFieldValue(field, receiver);
      }
  
!     @Test(dataProvider = "readConstantArrayElementDataProvider", dataProviderClass = ReadConstantArrayElementDataProvider.class)
      public void testReadConstantArrayElement(JavaConstant array, int index, JavaConstant expected, String testInfo) {
          JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElement(array, index);
          Assert.assertEquals(actual == null ? "null" : actual.toString(),
                          expected == null ? "null" : expected.toString(),
                          String.format("Unexpected result while testing %s:", testInfo));
      }
  
!     @Test(dataProvider = "readConstantArrayElementForOffsetDataProvider", dataProviderClass = ReadConstantArrayElementDataProvider.class)
      public void testReadConstantArrayElementForOffset(JavaConstant array, long offset, JavaConstant expected,
                      String testInfo) {
          JavaConstant actual = CONSTANT_REFLECTION_PROVIDER.readConstantArrayElementForOffset(array,
                          offset);
          Assert.assertEquals(actual == null ? "null" : actual.toString(),