--- /dev/null	2017-11-09 09:38:01.297999907 +0100
+++ new/test/jdk/jdk/jfr/jvm/TestJavaEvent.java	2018-04-09 18:59:04.524652738 +0200
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 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.jvm;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+
+import jdk.jfr.AnnotationElement;
+import jdk.jfr.Event;
+import jdk.jfr.EventType;
+import jdk.jfr.FlightRecorder;
+import jdk.jfr.Recording;
+import jdk.jfr.ValueDescriptor;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingFile;
+
+/*
+ * @test TestGetThreadId
+ * @key jfr
+ * @library /test/lib
+ * @modules jdk.jfr/jdk.jfr.internal
+ * @run main/othervm jdk.jfr.jvm.TestJavaEvent
+ */
+public class TestJavaEvent {
+
+    private static final int EVENTS_PER_THREAD = 50;
+    private static final int THREAD_COUNT = 100;
+
+    public static class MyEvent extends Event {
+        float floatValue;
+        double doubleValue;
+        int intValue;
+        long longValue;
+        char charValue;
+        byte byteValue;
+        String stringValue;
+        Thread threadValue;
+        Class<?> classValue;
+
+        public void setFloatValue(float value) {
+            floatValue = value;
+        }
+
+        public void setDoubleValue(double value) {
+            doubleValue = value;
+        }
+
+        public void setIntValue(int value) {
+            intValue = value;
+        }
+
+        public void setLongValue(long value) {
+            longValue = value;
+        }
+
+        public void setCharValue(char value) {
+            charValue = value;
+        }
+
+        public void setByteValue(byte value) {
+            byteValue = value;
+        }
+
+        public void setStringValue(String value) {
+            stringValue = value;
+        }
+
+        public void setThreadValue(Thread value) {
+            threadValue = value;
+        }
+
+        public void setClassValue(Class<?> value) {
+            classValue = value;
+        }
+    }
+
+    public static void main(String... args) throws IOException, InterruptedException {
+        Recording r = new Recording();
+        r.enable(MyEvent.class).withThreshold(Duration.ofNanos(0)).withoutStackTrace();
+        r.start();
+        List<Thread> threads = new ArrayList<>();
+        for (int n = 0; n < THREAD_COUNT; n++) {
+            Thread t = new Thread(TestJavaEvent::emitEvents);
+            threads.add(t);
+            t.start();
+        }
+        for (Thread t : threads) {
+            t.join();
+        }
+
+        r.stop();
+        // prettyPrint();
+        File file = File.createTempFile("test", ".jfr");
+        r.dump(file.toPath());
+        int eventCount = 0;
+        for (RecordedEvent e : RecordingFile.readAllEvents(file.toPath())) {
+            if (e.getEventType().getName().equals(MyEvent.class.getName())) {
+                eventCount++;
+            }
+            System.out.println(e);
+        }
+        System.out.println("Event count was " + eventCount + ", expected " + THREAD_COUNT * EVENTS_PER_THREAD);
+        r.close();
+    }
+
+    private static void emitEvents() {
+        for (int n = 0; n < EVENTS_PER_THREAD; n++) {
+            MyEvent event = new MyEvent();
+            event.begin();
+            event.end();
+            event.setFloatValue(1.12345f);
+            event.setDoubleValue(1.234567890);
+            event.setIntValue(123456);
+            event.setLongValue(1234567890);
+            event.setCharValue('c');
+            event.setByteValue((byte) 12);
+            event.setStringValue("1234567890");
+            event.setThreadValue(Thread.currentThread());
+            event.setClassValue(Class.class);
+            event.commit();
+            try {
+                Thread.sleep(1);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+    }
+
+    static void prettyPrint() {
+        for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) {
+            for (AnnotationElement a : type.getAnnotationElements()) {
+                printAnnotation("", a);
+            }
+            System.out.print("class " + removePackage(type.getName()));
+            System.out.print(" extends Event");
+
+            System.out.println(" {");
+            List<ValueDescriptor> values = type.getFields();
+            for (int i = 0; i < values.size(); i++) {
+                ValueDescriptor v = values.get(i);
+                for (AnnotationElement a : v.getAnnotationElements()) {
+                    printAnnotation("  ", a);
+                }
+                System.out.println("  " + removePackage(v.getTypeName() + brackets(v.isArray())) + " " + v.getName());
+                if (i != values.size() - 1) {
+                    System.out.println();
+                }
+            }
+            System.out.println("}");
+            System.out.println();
+        }
+    }
+
+    private static String brackets(boolean isArray) {
+        return isArray ? "[]" : "";
+    }
+
+    private static String removePackage(String s) {
+
+        int index = s.lastIndexOf(".");
+        return s.substring(index + 1);
+    }
+
+    private static void printAnnotation(String indent, AnnotationElement a) {
+        String name = removePackage(a.getTypeName());
+        if (a.getValues().isEmpty()) {
+            System.out.println(indent + "@" + name);
+            return;
+        }
+        System.out.print(indent + "@" + name + "(");
+        for (Object o : a.getValues()) {
+            printAnnotationValue(o);
+        }
+        System.out.println(")");
+    }
+
+    private static void printAnnotationValue(Object o) {
+        if (o instanceof String) {
+            System.out.print("\"" + o + "\"");
+        } else {
+            System.out.print(String.valueOf(o));
+        }
+    }
+
+}