test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java

*** 35,63 ****
  package jdk.vm.ci.runtime.test;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
- import static org.junit.Assert.assertNull;
  import static org.junit.Assert.assertTrue;
  
  import java.lang.annotation.Annotation;
  import java.lang.reflect.Field;
  import java.lang.reflect.Method;
  import java.util.Arrays;
  import java.util.HashSet;
- import java.util.List;
  import java.util.Map;
  import java.util.Set;
  
! import jdk.vm.ci.meta.JavaConstant;
  import jdk.vm.ci.meta.LocationIdentity;
  import jdk.vm.ci.meta.ResolvedJavaField;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
- import org.junit.Test;
- 
  /**
   * Tests for {@link ResolvedJavaField}.
   */
  public class TestResolvedJavaField extends FieldUniverse {
  
--- 35,60 ----
  package jdk.vm.ci.runtime.test;
  
  import static org.junit.Assert.assertArrayEquals;
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  
  import java.lang.annotation.Annotation;
  import java.lang.reflect.Field;
  import java.lang.reflect.Method;
  import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Map;
  import java.util.Set;
  
! import org.junit.Test;
! 
  import jdk.vm.ci.meta.LocationIdentity;
  import jdk.vm.ci.meta.ResolvedJavaField;
  import jdk.vm.ci.meta.ResolvedJavaMethod;
  
  /**
   * Tests for {@link ResolvedJavaField}.
   */
  public class TestResolvedJavaField extends FieldUniverse {
  
*** 109,147 ****
              LocationIdentity identity = e.getValue().getLocationIdentity();
              assertTrue(identity != null);
          }
      }
  
-     static class ReadConstantValueTestConstants {
-         String stringField = "field";
-         final String constantStringField = "constantField";
- 
-         static final Object CONST1 = new ReadConstantValueTestConstants();
-         static final Object CONST2 = null;
-         static final Object CONST3 = new String();
-     }
- 
-     @Test
-     public void readConstantValueTest() throws NoSuchFieldException {
-         ResolvedJavaField field = metaAccess.lookupJavaField(ReadConstantValueTestConstants.class.getDeclaredField("stringField"));
-         List<ConstantValue> receiverConstants = readConstants(ReadConstantValueTestConstants.class);
-         for (ConstantValue receiver : receiverConstants) {
-             JavaConstant value = constantReflection.readConstantFieldValue(field, receiver.value);
-             assertNull(value);
-         }
- 
-         ResolvedJavaField constField = metaAccess.lookupJavaField(ReadConstantValueTestConstants.class.getDeclaredField("constantStringField"));
-         for (ConstantValue receiver : receiverConstants) {
-             JavaConstant value = constantReflection.readConstantFieldValue(constField, receiver.value);
-             if (value != null) {
-                 Object expected = "constantField";
-                 String actual = ((ReadConstantValueTestConstants) receiver.boxed).constantStringField;
-                 assertTrue(actual + " != " + expected, actual == expected);
-             }
-         }
-     }
- 
      private Method findTestMethod(Method apiMethod) {
          String testName = apiMethod.getName() + "Test";
          for (Method m : getClass().getDeclaredMethods()) {
              if (m.getName().equals(testName) && m.getAnnotation(Test.class) != null) {
                  return m;
--- 106,115 ----