--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016, 2018, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 jdk.jfr.api.consumer;
+
+import static jdk.test.lib.Asserts.assertEquals;
+import static jdk.test.lib.Asserts.assertFalse;
+import static jdk.test.lib.Asserts.assertNotNull;
+import static jdk.test.lib.Asserts.assertTrue;
+
+import java.util.List;
+
+import jdk.jfr.Event;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordedMethod;
+import jdk.jfr.consumer.RecordedFrame;
+import jdk.jfr.consumer.RecordedStackTrace;
+import jdk.test.lib.jfr.Events;
+
+
+/*
+ * @test
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.consumer.TestRecordedMethodDescriptor
+ */
+public final class TestRecordedMethodDescriptor {
+
+    private static boolean isMainMethodDescriptorRecorded;
+    private static final String MAIN_METHOD_DESCRIPTOR = "([Ljava/lang/String;)V";
+    private static final String MAIN_METHOD_NAME = "main";
+
+    public static void main(String[] args) throws Throwable {
+        Recording recording = new Recording();
+        recording.enable(MyEvent.class).withStackTrace();
+        recording.start();
+
+        MyEvent event = new MyEvent();
+        event.begin();
+        event.end();
+        event.commit();
+        recording.stop();
+
+        List<RecordedEvent> recordedEvents = Events.fromRecording(recording);
+        assertEquals(1, recordedEvents.size(), "Expected one event");
+        RecordedEvent recordedEvent = recordedEvents.get(0);
+
+        RecordedStackTrace stacktrace = recordedEvent.getStackTrace();
+        List<RecordedFrame> frames = stacktrace.getFrames();
+        assertFalse(frames.isEmpty(), "Stacktrace frames was empty");
+        for (RecordedFrame frame : frames) {
+            analyzeRecordedMethodDescriptor(frame.getMethod());
+        }
+
+        assertTrue(isMainMethodDescriptorRecorded, "main() method descriptor has never been recorded");
+    }
+
+    private static void analyzeRecordedMethodDescriptor(RecordedMethod method) {
+
+        String descr = method.getDescriptor();
+        assertNotNull(descr, "Method descriptor is null");
+        String name = method.getName();
+        assertNotNull(name, "Method name is null");
+
+        if (name.equals(MAIN_METHOD_NAME) && descr.equals(MAIN_METHOD_DESCRIPTOR)) {
+            assertFalse(isMainMethodDescriptorRecorded, "main() method descriptor already recorded");
+            isMainMethodDescriptorRecorded = true;
+        }
+    }
+
+    public static class MyEvent extends Event {
+    }
+
+}