*** old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java	Fri Jul  7 09:29:40 2017
--- new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/StraighteningTest.java	Fri Jul  7 09:29:39 2017

*** 20,36 ****
--- 20,35 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.test;
  
! import org.junit.Test;
  
  import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.nodes.StructuredGraph;
  import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
  import org.graalvm.compiler.phases.common.CanonicalizerPhase;
  import org.graalvm.compiler.phases.tiers.PhaseContext;
+ import org.junit.Test;
  
  public class StraighteningTest extends GraalCompilerTest {
  
      private static final String REFERENCE_SNIPPET = "ref";
  

*** 86,96 ****
--- 85,96 ----
      }
  
      private void test(final String snippet) {
          // No debug scope to reduce console noise for @Test(expected = ...) tests
          StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
!         Debug.dump(Debug.BASIC_LEVEL, graph, "Graph");
!         DebugContext debug = graph.getDebug();
+         debug.dump(DebugContext.BASIC_LEVEL, graph, "Graph");
          new CanonicalizerPhase().apply(graph, new PhaseContext(getProviders()));
          StructuredGraph referenceGraph = parseEager(REFERENCE_SNIPPET, AllowAssumptions.YES);
          assertEquals(referenceGraph, graph);
      }
  }