--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestDescription.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, 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.metadata.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import jdk.jfr.AnnotationElement;
+import jdk.jfr.Description;
+import jdk.jfr.Event;
+import jdk.jfr.EventType;
+import jdk.jfr.MetadataDefinition;
+import jdk.jfr.SettingDefinition;
+import jdk.jfr.SettingDescriptor;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.SimpleSetting;
+
+/*
+ * @test
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.metadata.annotations.TestDescription
+ */
+public class TestDescription {
+
+    @MetadataDefinition
+    @Target({ ElementType.TYPE })
+    @Retention(RetentionPolicy.RUNTIME)
+    @Description("Meta Annotation")
+    @interface AnnotationWithDescription {
+    }
+
+    @AnnotationWithDescription
+    @Description("Event Annotation")
+    static class DescriptionEvent extends Event {
+        @Description("Field Annotation")
+        String field;
+
+        @SettingDefinition
+        @Description("Setting description")
+        boolean dummy(SimpleSetting ds) {
+            return true;
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        EventType t = EventType.getEventType(DescriptionEvent.class);
+
+        // field description
+        AnnotationElement aMax = Events.getAnnotation(t.getField("field"), Description.class);
+        String d = (String) aMax.getValue("value");
+        Asserts.assertEquals("Field Annotation", d, "Incorrect annotation for field, got '" + d + "'");
+
+        // event description
+        d = t.getAnnotation(Description.class).value();
+        Asserts.assertEquals("Event Annotation", d, "Incorrect annotation for event, got '" + d + "'");
+
+        // annotation description
+        AnnotationElement a = Events.getAnnotationByName(t, AnnotationWithDescription.class.getName());
+        Description de = a.getAnnotation(Description.class);
+        Asserts.assertEquals("Meta Annotation", de.value(), "Incorrect annotation for event, got '" + de.value() + "'");
+
+        for (SettingDescriptor v: t.getSettingDescriptors()) {
+            if (v.getName().equals("dummy")) {
+                Description settingDescription = v.getAnnotation(Description.class);
+                Asserts.assertEquals(settingDescription.value(), "Setting description", "Incorrect description for setting");
+            }
+        }
+    }
+}