--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 22 17:57:40 2014 -0700
@@ -36,76 +36,73 @@
 
 public class TestSmoke extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "8006735";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-private", "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-private", "-sourcepath", SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + "/pkg/T0x1C.html", "@DA"},
-        {BUG_ID + "/pkg/T0x1D.html", "@DA"},
-        {BUG_ID + "/pkg/T0x0D.html", "@DA"},
-        {BUG_ID + "/pkg/T0x06.html", "@DA"},
-        {BUG_ID + "/pkg/T0x0B.html", "@DA"},
-        {BUG_ID + "/pkg/T0x0F.html", "@DA"},
+        { "pkg/T0x1C.html", "@DA"},
+        { "pkg/T0x1D.html", "@DA"},
+        { "pkg/T0x0D.html", "@DA"},
+        { "pkg/T0x06.html", "@DA"},
+        { "pkg/T0x0B.html", "@DA"},
+        { "pkg/T0x0F.html", "@DA"},
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + "/pkg/T0x20.html", "@DA"},
+        { "pkg/T0x20.html", "@DA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + "/pkg/T0x20A.html", "@DTPA"},
+        { "pkg/T0x20A.html", "@DTPA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + "/pkg/T0x20B.html", "@DA"},
+        { "pkg/T0x20B.html", "@DA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + "/pkg/T0x22.html", "@DA"},
+        { "pkg/T0x22.html", "@DA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + "/pkg/T0x22A.html", "@DTPA"},
+        { "pkg/T0x22A.html", "@DTPA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + "/pkg/T0x22B.html", "@DA"},
+        { "pkg/T0x22B.html", "@DA"},
         */
-        {BUG_ID + "/pkg/T0x10.html", "@DA"},
-        {BUG_ID + "/pkg/T0x10A.html", "@DA"},
-        {BUG_ID + "/pkg/T0x12.html", "@DA"},
-        {BUG_ID + "/pkg/T0x11.html", "@DA"},
-        {BUG_ID + "/pkg/T0x13.html", "@DA"},
-        {BUG_ID + "/pkg/T0x15.html", "@DA"},
-        {BUG_ID + "/pkg/T0x14.html", "@DA"},
-        {BUG_ID + "/pkg/T0x16.html", "@DA"}
+        { "pkg/T0x10.html", "@DA"},
+        { "pkg/T0x10A.html", "@DA"},
+        { "pkg/T0x12.html", "@DA"},
+        { "pkg/T0x11.html", "@DA"},
+        { "pkg/T0x13.html", "@DA"},
+        { "pkg/T0x15.html", "@DA"},
+        { "pkg/T0x14.html", "@DA"},
+        { "pkg/T0x16.html", "@DA"}
     };
 
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + "/pkg/T0x1C.html", "@A"},
-        {BUG_ID + "/pkg/T0x1D.html", "@A"},
-        {BUG_ID + "/pkg/T0x00.html", "@A"},
-        {BUG_ID + "/pkg/T0x01.html", "@A"},
-        {BUG_ID + "/pkg/T0x02.html", "@A"},
-        {BUG_ID + "/pkg/T0x04.html", "@A"},
-        {BUG_ID + "/pkg/T0x08.html", "@A"},
-        {BUG_ID + "/pkg/T0x0D.html", "@A"},
-        {BUG_ID + "/pkg/T0x06.html", "@A"},
-        {BUG_ID + "/pkg/T0x0B.html", "@A"},
-        {BUG_ID + "/pkg/T0x0F.html", "@A"},
-        {BUG_ID + "/pkg/T0x20.html", "@A"},
-        {BUG_ID + "/pkg/T0x20A.html", "@A"},
-        {BUG_ID + "/pkg/T0x20B.html", "@A"},
-        {BUG_ID + "/pkg/T0x22.html", "@A"},
-        {BUG_ID + "/pkg/T0x22A.html", "@A"},
-        {BUG_ID + "/pkg/T0x22B.html", "@A"},
-        {BUG_ID + "/pkg/T0x10.html", "@A"},
-        {BUG_ID + "/pkg/T0x10A.html", "@A"},
-        {BUG_ID + "/pkg/T0x12.html", "@A"},
-        {BUG_ID + "/pkg/T0x11.html", "@A"},
-        {BUG_ID + "/pkg/T0x13.html", "@A"},
-        {BUG_ID + "/pkg/T0x15.html", "@A"},
-        {BUG_ID + "/pkg/T0x14.html", "@A"},
-        {BUG_ID + "/pkg/T0x16.html", "@A"}
+        { "pkg/T0x1C.html", "@A"},
+        { "pkg/T0x1D.html", "@A"},
+        { "pkg/T0x00.html", "@A"},
+        { "pkg/T0x01.html", "@A"},
+        { "pkg/T0x02.html", "@A"},
+        { "pkg/T0x04.html", "@A"},
+        { "pkg/T0x08.html", "@A"},
+        { "pkg/T0x0D.html", "@A"},
+        { "pkg/T0x06.html", "@A"},
+        { "pkg/T0x0B.html", "@A"},
+        { "pkg/T0x0F.html", "@A"},
+        { "pkg/T0x20.html", "@A"},
+        { "pkg/T0x20A.html", "@A"},
+        { "pkg/T0x20B.html", "@A"},
+        { "pkg/T0x22.html", "@A"},
+        { "pkg/T0x22A.html", "@A"},
+        { "pkg/T0x22B.html", "@A"},
+        { "pkg/T0x10.html", "@A"},
+        { "pkg/T0x10A.html", "@A"},
+        { "pkg/T0x12.html", "@A"},
+        { "pkg/T0x11.html", "@A"},
+        { "pkg/T0x13.html", "@A"},
+        { "pkg/T0x15.html", "@A"},
+        { "pkg/T0x14.html", "@A"},
+        { "pkg/T0x16.html", "@A"}
     };
 
     /**
@@ -117,18 +114,4 @@
         tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }