*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java	Fri Jul  7 09:30:07 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalMBeanTest.java	Fri Jul  7 09:30:07 2017

*** 39,49 ****
--- 39,49 ----
  import javax.management.MBeanOperationInfo;
  import javax.management.MBeanServer;
  import javax.management.ObjectInstance;
  import javax.management.ObjectName;
  
! import org.graalvm.compiler.debug.GraalDebugConfig;
! import org.graalvm.compiler.debug.DebugOptions;
  import org.graalvm.compiler.hotspot.HotSpotGraalMBean;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.test.GraalTest;
  import org.graalvm.util.EconomicMap;
  import org.junit.Assume;

*** 225,241 ****
--- 225,241 ----
          OptionValues unsetDump = realBean.optionsFor(empty, null);
          final MetaAccessProvider metaAccess = jdk.vm.ci.runtime.JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess();
          ResolvedJavaMethod method = metaAccess.lookupJavaMethod(Arrays.class.getMethod("asList", Object[].class));
          final OptionValues forMethod = realBean.optionsFor(unsetDump, method);
          assertNotSame(unsetDump, forMethod);
!         Object nothing = unsetDump.getMap().get(GraalDebugConfig.Options.Dump);
          assertEquals("Empty string", "", nothing);
  
!         Object specialValue = forMethod.getMap().get(GraalDebugConfig.Options.Dump);
          assertEquals(":3", specialValue);
  
          OptionValues normalMethod = realBean.optionsFor(unsetDump, null);
!         Object noSpecialValue = normalMethod.getMap().get(GraalDebugConfig.Options.Dump);
          assertEquals("Empty string", "", noSpecialValue);
      }
  
  }