--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/debug/MethodMetricsTestInterception01.java	2017-07-07 09:32:12.000000000 -0700
+++ /dev/null	2017-07-07 09:32:12.000000000 -0700
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 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.
- */
-package org.graalvm.compiler.core.test.debug;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Test;
-
-import org.graalvm.compiler.debug.Debug;
-import org.graalvm.compiler.debug.DebugConfig;
-import org.graalvm.compiler.debug.DebugCounter;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.DebugMemUseTracker;
-import org.graalvm.compiler.debug.DebugMethodMetrics;
-import org.graalvm.compiler.debug.DebugTimer;
-import org.graalvm.compiler.debug.DebugValueFactory;
-import org.graalvm.compiler.debug.DebugVerifyHandler;
-import org.graalvm.compiler.debug.GraalDebugConfig;
-import org.graalvm.compiler.debug.internal.CounterImpl;
-import org.graalvm.compiler.debug.internal.MemUseTrackerImpl;
-import org.graalvm.compiler.debug.internal.TimerImpl;
-import org.graalvm.compiler.debug.internal.method.MethodMetricsImpl;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.Phase;
-
-import jdk.vm.ci.meta.ResolvedJavaMethod;
-
-// intercepting metrics
-public class MethodMetricsTestInterception01 extends MethodMetricsTest {
-
-    @Override
-    protected Phase additionalPhase() {
-        return new MethodMetricPhases.CountingAddPhase();
-    }
-
-    @Override
-    DebugConfig getConfig() {
-        List<DebugDumpHandler> dumpHandlers = new ArrayList<>();
-        List<DebugVerifyHandler> verifyHandlers = new ArrayList<>();
-        OptionValues options = getInitialOptions();
-        GraalDebugConfig debugConfig = new GraalDebugConfig(
-                        options,
-                        GraalDebugConfig.Options.Log.getValue(options),
-                        "CountingAddPhase",
-                        GraalDebugConfig.Options.TrackMemUse.getValue(options),
-                        "CountingAddPhase",
-                        GraalDebugConfig.Options.Dump.getValue(options),
-                        GraalDebugConfig.Options.Verify.getValue(options),
-                        "MethodMetricsTest$TestApplication.*",
-                        "CountingAddPhase",
-                        System.out, dumpHandlers, verifyHandlers);
-        return debugConfig;
-    }
-
-    private DebugValueFactory factory;
-
-    @Test
-    @Override
-    @SuppressWarnings("try")
-    public void test() throws Throwable {
-        factory = Debug.getDebugValueFactory();
-        Debug.setDebugValueFactory(new DebugValueFactory() {
-            @Override
-            public DebugTimer createTimer(String name, boolean conditional) {
-                return new TimerImpl(name, conditional, true);
-            }
-
-            @Override
-            public DebugCounter createCounter(String name, boolean conditional) {
-                return CounterImpl.create(name, conditional, true);
-            }
-
-            @Override
-            public DebugMethodMetrics createMethodMetrics(ResolvedJavaMethod method) {
-                return MethodMetricsImpl.getMethodMetrics(method);
-            }
-
-            @Override
-            public DebugMemUseTracker createMemUseTracker(String name, boolean conditional) {
-                return new MemUseTrackerImpl(name, conditional, true);
-            }
-        });
-        super.test();
-
-    }
-
-    @Override
-    public void afterTest() {
-        super.afterTest();
-        Debug.setDebugValueFactory(factory);
-    }
-
-    @Override
-    @SuppressWarnings("try")
-    void assertValues() throws Throwable {
-        assertValues("GlobalMetric", new long[]{1, 1, 1, 1, 1, 1, 1, 1, 1, 1});
-    }
-}