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

*** 35,50 ****
      @DataProvider(name = "boxPrimitiveDataProvider")
      public static Object[][] boxPrimitiveDataProvider() {
          LinkedList<Object[]> cfgSet = new LinkedList<>();
          // Boolean testing
          cfgSet.add(
!                         new Object[]{JavaConstant.forBoolean(true), CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true)});
          cfgSet.add(new Object[]{JavaConstant.forBoolean(false),
!                         CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false)});
          // Boxed boolean testing (returns null)
!         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) true), null});
!         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject((Boolean) false), null});
          for (byte number : new byte[]{-128, 0, 1, 127}) {
              // Integer primitives testing
              cfgSet.add(new Object[]{JavaConstant.forByte(number),
                              CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number))});
              cfgSet.add(new Object[]{JavaConstant.forShort(number),
--- 35,50 ----
      @DataProvider(name = "boxPrimitiveDataProvider")
      public static Object[][] boxPrimitiveDataProvider() {
          LinkedList<Object[]> cfgSet = new LinkedList<>();
          // Boolean testing
          cfgSet.add(
!                         new Object[]{JavaConstant.forBoolean(true), CONSTANT_REFLECTION_PROVIDER.forObject(true)});
          cfgSet.add(new Object[]{JavaConstant.forBoolean(false),
!                         CONSTANT_REFLECTION_PROVIDER.forObject(false)});
          // Boxed boolean testing (returns null)
!         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(true), null});
!         cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(false), null});
          for (byte number : new byte[]{-128, 0, 1, 127}) {
              // Integer primitives testing
              cfgSet.add(new Object[]{JavaConstant.forByte(number),
                              CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number))});
              cfgSet.add(new Object[]{JavaConstant.forShort(number),
*** 57,68 ****
                  cfgSet.add(new Object[]{JavaConstant.forChar((char) number),
                                  CONSTANT_REFLECTION_PROVIDER.forObject(Character.valueOf((char) number))});
              }
              // Float and Double variables are not cached,
              // so the tested method returns "null" on them
!             cfgSet.add(new Object[]{JavaConstant.forFloat((float) number), null});
!             cfgSet.add(new Object[]{JavaConstant.forDouble((double) number), null});
              // Boxed primitives testing (return null)
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number)), null});
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Short.valueOf(number)), null});
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Integer.valueOf(number)), null});
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Long.valueOf(number)), null});
--- 57,68 ----
                  cfgSet.add(new Object[]{JavaConstant.forChar((char) number),
                                  CONSTANT_REFLECTION_PROVIDER.forObject(Character.valueOf((char) number))});
              }
              // Float and Double variables are not cached,
              // so the tested method returns "null" on them
!             cfgSet.add(new Object[]{JavaConstant.forFloat(number), null});
!             cfgSet.add(new Object[]{JavaConstant.forDouble(number), null});
              // Boxed primitives testing (return null)
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Byte.valueOf(number)), null});
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Short.valueOf(number)), null});
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Integer.valueOf(number)), null});
              cfgSet.add(new Object[]{CONSTANT_REFLECTION_PROVIDER.forObject(Long.valueOf(number)), null});