Overview List

+ * + * rtm state ^ + * | + * UseRTM | ******| ****** + * | | + * ProfileRTM |******| |*****| + * | | | | + * 0-------|-----|-----|---------------------> time + * | | \ force abort + * | | + * | \ force deoptimization + * | + * \ force xabort + *

+ * Example: + * com/example/Klass::method => com/example/Klass.method + * com/example/Klass.method => com/example/Klass.method + * com.example.Klass::method => com/example/Klass.method + * com.example.Klass.method => com/example/Klass.method + *

Permission Target Name	What the Permission Allows	Risks of Allowing this Permission
setOption.SO_FLOW_SLA	set the {@link ExtendedSocketOptions#SO_FLOW_SLA SO_FLOW_SLA} option + * on any socket that supports it	allows caller to set a higher priority or bandwidth allocation + * to sockets it creates, than they might otherwise be allowed.
getOption.SO_FLOW_SLA	retrieve the {@link ExtendedSocketOptions#SO_FLOW_SLA SO_FLOW_SLA} + * setting from any socket that supports the option	allows caller access to SLA information that it might not + * otherwise have

Permission Target Name

What the Permission Allows

Risks of Allowing this Permission

setOption.SO_FLOW_SLA

set the {@link ExtendedSocketOptions#SO_FLOW_SLA SO_FLOW_SLA} option + * on any socket that supports it

allows caller to set a higher priority or bandwidth allocation + * to sockets it creates, than they might otherwise be allowed.

getOption.SO_FLOW_SLA

retrieve the {@link ExtendedSocketOptions#SO_FLOW_SLA SO_FLOW_SLA} + * setting from any socket that supports the option

allows caller access to SLA information that it might not + * otherwise have

public static final java." + + { "pkg/AnnotationTypeField.html", + "

DEFAULT_NAME

\n" + + "

public static final java." +
             "lang.String DEFAULT_NAME

"}, - {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "

Summary:

" + NL + "

Field |

"}, - {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "

Detail:

" + NL + "

Field |

"}, + { "pkg/AnnotationType.html", + "

Summary:

\n" + + "

Field |

"}, + { "pkg/AnnotationType.html", + "

Detail:

\n" + + "

Field |

"}, }; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "pkg" + FS + "AnnotationType.html", - "

" + NL + NL + "

" + + { "pkg/AnnotationType.html", + "

\n\n" + + "

" + "" + "

"} }; @@ -80,21 +84,7 @@ */ public static void main(String[] args) { TestAnnotationTypes tester = new TestAnnotationTypes(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java --- a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,14 +35,12 @@ public class TestBackSlashInLink extends JavadocTester { - private static final String BUG_ID = "4511110"; private static final String[][] TEST = { - {BUG_ID + FS + "C.html", "src-html/C.html#line.7"}}; - private static final String[][] NEGATED_TEST = NO_TEST; + { "C.html", "src-html/C.html#line.7"}}; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, - "-linksource", SRC_DIR + FS + "C.java"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, + "-linksource", SRC_DIR + "/C.java"}; /** * The entry point of the test. @@ -50,21 +48,7 @@ */ public static void main(String[] args) { TestBackSlashInLink tester = new TestBackSlashInLink(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java --- a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,18 +35,16 @@ public class TestBadPackageFileInJar extends JavadocTester { - private static final String BUG_ID = "4691095"; - private static final String[][] TEST = new String[][] { {ERROR_OUTPUT, - "badPackageFileInJar.jar" +FS+"pkg/package.html: error - Body tag missing from HTML"} + "badPackageFileInJar.jar" + FS + "pkg/package.html: error - Body tag missing from HTML"} }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-classpath", - SRC_DIR + FS + "badPackageFileInJar.jar", "pkg"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-classpath", + SRC_DIR + "/badPackageFileInJar.jar", "pkg"}; /** @@ -55,21 +53,7 @@ */ public static void main(String[] args) { TestBadPackageFileInJar tester = new TestBadPackageFileInJar(); - run(tester, ARGS, TEST, NO_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java --- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,40 +35,19 @@ public class TestBadSourceFile extends JavadocTester { - //Test information. - private static final String BUG_ID = "4835749"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "C2.java" + "-Xdoclint:none", "-d", OUTPUT_DIR, SRC_DIR + "/C2.java" }; - //Input for string search tests. - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = NO_TEST; - /** * The entry point of the test. * @param args the array of command line arguments. */ public static void main(String[] args) { TestBadSourceFile tester = new TestBadSourceFile(); - int exitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int exitCode = tester.run(ARGS, NO_TEST, NO_TEST); tester.checkExitCode(0, exitCode); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java --- a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,14 +35,11 @@ public class TestBaseClass extends JavadocTester { - private static final String BUG_ID = "4197513"; - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-sourcepath", SRC_DIR, "-docletpath", SRC_DIR, "-doclet", "BaseClass", - SRC_DIR + FS + "Bar.java", "baz"}; + SRC_DIR + "/Bar.java", "baz"}; /** * The entry point of the test. @@ -50,22 +47,8 @@ */ public static void main(String[] args) { TestBaseClass tester = new TestBaseClass(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, NO_TEST, NO_TEST) != 0) { throw new Error("Javadoc failed to execute."); } } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java --- a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -37,14 +37,12 @@ public class TestBreakIterator extends JavadocTester { - private static final String BUG_ID = "4165985"; private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "BreakIteratorTest.html", + { "pkg/BreakIteratorTest.html", "The class is empty (i.e. it has no members)."}}; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-breakiterator", "pkg"}; /** @@ -53,21 +51,7 @@ */ public static void main(String[] args) { TestBreakIterator tester = new TestBreakIterator(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java --- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -37,20 +37,17 @@ public class TestCRLineSeparator extends JavadocTester { - //Test information. - private static final String BUG_ID = "4979486-8014636"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", ".", "pkg" + "-d", OUTPUT_DIR, "-sourcepath", ".", "pkg" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "MyClass.html", "Line 1" + NL + " Line 2"} + { "pkg/MyClass.html", "Line 1\n" + + " Line 2"} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -59,24 +56,10 @@ public static void main(String[] args) throws Exception { initFiles(new File(SRC_DIR), new File("."), "pkg"); TestCRLineSeparator tester = new TestCRLineSeparator(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } - // recursively copy files from fromDir to toDir, replacing newlines // with \r static void initFiles(File fromDir, File toDir, String f) throws IOException { diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testCharset/TestCharset.java --- a/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 @@ -34,25 +34,22 @@ public class TestCharset extends JavadocTester { - //Test information. - private static final String BUG_ID = "7052170"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-charset", "UTF-8", "-sourcepath", SRC_DIR, "pkg" + "-d", OUTPUT_DIR, "-charset", "UTF-8", "-sourcepath", SRC_DIR, "pkg" }; private static final String[][] TEST = { - {BUG_ID + FS + "index.html", + { "index.html", ""}, - {BUG_ID + FS + "pkg" + FS + "Foo.html", + { "pkg/Foo.html", ""} }; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "index.html", + { "index.html", ""}, - {BUG_ID + FS + "pkg" + FS + "Foo.html", + { "pkg/Foo.html", ""} }; @@ -62,21 +59,7 @@ */ public static void main(String[] args) { TestCharset tester = new TestCharset(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java --- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -34,30 +34,29 @@ public class TestClassCrossReferences extends JavadocTester { - private static final String BUG_ID = "4652655-4857717"; private static final String[][] TEST = { - {BUG_ID + FS + "C.html", + { "C.html", "Link to math package"}, - {BUG_ID + FS + "C.html", + { "C.html", "Link to AttributeContext innerclass"}, - {BUG_ID + FS + "C.html", + { "C.html", "Link to external class BigDecimal"}, - {BUG_ID + FS + "C.html", + { "C.html", "Link to external member gcd"}, - {BUG_ID + FS + "C.html", - "

Overrides:: toString in class java.lang.Object
See Also:: Inner(), " + NL + - "Inner(int), " + NL + - "NestedInner(), " + NL + - "NestedInner(int), " + NL + - "Outer(), " + NL + + { "pkg1/Outer.html", + "
See Also:: Inner(), \n" + + "Inner(int), \n" + + "NestedInner(), \n" + + "NestedInner(int), \n" + + "Outer(), \n" + "Outer(int)" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Link: Inner(), " + "Outer(int), " + "" + "NestedInner(int)" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Outer()" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Outer(int i)" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html", + { "pkg1/Outer.Inner.html", "Inner()" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html", + { "pkg1/Outer.Inner.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html", + { "pkg1/Outer.Inner.html", "Inner(int i)" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html", + { "pkg1/Outer.Inner.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", + { "pkg1/Outer.Inner.NestedInner.html", "NestedInner()" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", + { "pkg1/Outer.Inner.NestedInner.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", + { "pkg1/Outer.Inner.NestedInner.html", "NestedInner(int i)" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", + { "pkg1/Outer.Inner.NestedInner.html", "" } }; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html", + { "pkg1/Outer.Inner.html", "Outer.Inner--" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html", + { "pkg1/Outer.Inner.html", "Outer.Inner-int-" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", + { "pkg1/Outer.Inner.NestedInner.html", "Outer.Inner.NestedInner--" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html", + { "pkg1/Outer.Inner.NestedInner.html", "Outer.Inner.NestedInner-int-" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Outer.Inner()" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Outer.Inner(int)" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Outer.Inner.NestedInner()" }, - {BUG_ID + FS + "pkg1" + FS + "Outer.html", + { "pkg1/Outer.html", "Outer.Inner.NestedInner(int)" } }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1" }; /** @@ -127,21 +125,7 @@ */ public static void main(String[] args) throws Exception { TestConstructors tester = new TestConstructors(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java --- a/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 @@ -33,27 +33,26 @@ public class TestCustomTag extends JavadocTester { - //Test information. - private static final String BUG_ID = "8006248"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-Xdoclint:none", "-d", BUG_ID, "-tagletpath", SRC_DIR, + "-Xdoclint:none", "-d", OUTPUT_DIR, "-tagletpath", SRC_DIR, "-taglet", "taglets.CustomTag", "-sourcepath", - SRC_DIR, SRC_DIR + FS + "TagTestClass.java" + SRC_DIR, SRC_DIR + "/TagTestClass.java" }; private static final String[] ARGS1 = new String[] { - "-d", BUG_ID + "-1", "-tagletpath", SRC_DIR, "-taglet", "taglets.CustomTag", - "-sourcepath", SRC_DIR, SRC_DIR + FS + "TagTestClass.java" + "-d", OUTPUT_DIR + "-1", "-tagletpath", + SRC_DIR, "-taglet", "taglets.CustomTag", + "-sourcepath", SRC_DIR, SRC_DIR + "/TagTestClass.java" }; private static final String[] ARGS2 = new String[] { - "-Xdoclint:none", "-d", BUG_ID + "-2", "-sourcepath", - SRC_DIR, SRC_DIR + FS + "TagTestClass.java" + "-Xdoclint:none", "-d", OUTPUT_DIR + "-2", "-sourcepath", + SRC_DIR, SRC_DIR + "/TagTestClass.java" }; private static final String[] ARGS3 = new String[] { - "-d", BUG_ID + "-3", "-sourcepath", SRC_DIR, SRC_DIR + FS + "TagTestClass.java" + "-d", OUTPUT_DIR + "-3", "-sourcepath", + SRC_DIR, SRC_DIR + "/TagTestClass.java" }; //Input for string search tests. @@ -86,24 +85,10 @@ */ public static void main(String[] args) { TestCustomTag tester = new TestCustomTag(); - run(tester, ARGS, TEST, NO_TEST); - run(tester, ARGS1, TEST1, NO_TEST); - run(tester, ARGS2, TEST2, NO_TEST); - run(tester, ARGS3, TEST3, NO_TEST); + tester.run(ARGS, TEST, NO_TEST); + tester.run(ARGS1, TEST1, NO_TEST); + tester.run(ARGS2, TEST2, NO_TEST); + tester.run(ARGS3, TEST3, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java --- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -33,19 +33,16 @@ public class TestDeprecatedDocs extends JavadocTester { - //Test information. - private static final String BUG_ID = "4927552"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg" }; private static final String TARGET_FILE = - BUG_ID + FS + "deprecated-list.html"; + "deprecated-list.html"; private static final String TARGET_FILE2 = - BUG_ID + FS + "pkg" + FS + "DeprecatedClassByAnnotation.html"; + "pkg/DeprecatedClassByAnnotation.html"; //Input for string search tests. private static final String[][] TEST = { @@ -75,46 +72,30 @@ {TARGET_FILE, "pkg.DeprecatedClassByAnnotation.method()"}, {TARGET_FILE, "pkg.DeprecatedClassByAnnotation.field"}, - {TARGET_FILE2, "
@Deprecated" + NL + - "public class DeprecatedClassByAnnotation" + NL + + {TARGET_FILE2, "
@Deprecated\n" + + "public class DeprecatedClassByAnnotation\n" + "extends java.lang.Object
"}, - {TARGET_FILE2, "
@Deprecated" + NL + - "public int field
" + NL + + {TARGET_FILE2, "
@Deprecated\n" + + "public int field
\n" + "
Deprecated.
"}, - {TARGET_FILE2, "
@Deprecated" + NL + - "public DeprecatedClassByAnnotation()
" + NL + + {TARGET_FILE2, "
@Deprecated\n" + + "public DeprecatedClassByAnnotation()
\n" + "
Deprecated.
"}, - {TARGET_FILE2, "
@Deprecated" + NL + - "public void method()
" + NL + + {TARGET_FILE2, "
@Deprecated\n" + + "public void method()
\n" + "
Deprecated.
"}, }; - private static final String[][] NEGATED_TEST = NO_TEST; - /** * The entry point of the test. * @param args the array of command line arguments. */ public static void main(String[] args) { TestDeprecatedDocs tester = new TestDeprecatedDocs(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java --- a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -38,20 +38,19 @@ public class TestDocEncoding extends JavadocTester { - //Test information. - private static final String BUG_ID = "8000743"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-docencoding", "Cp930", - "-sourcepath", SRC_DIR, "pkg" + "-d", OUTPUT_DIR, + "-docencoding", "Cp930", + "-sourcepath", SRC_DIR, + "-notimestamp", + "pkg" }; - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "stylesheet.css", - "body {" + NL + " background-color:#ffffff;"} + { "stylesheet.css", + "body {\n" + + " background-color:#ffffff;"} }; /** @@ -60,22 +59,8 @@ */ public static void main(String[] args) { TestDocEncoding tester = new TestDocEncoding(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java --- a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,19 +35,12 @@ public class TestDocErrorReporter extends JavadocTester { - //Test information. - private static final String BUG_ID = "4927928"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-encoding", "xyz", - SRC_DIR + FS + "TestDocErrorReporter.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-encoding", "xyz", + SRC_DIR + "/TestDocErrorReporter.java" }; - //Input for string search tests. - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = NO_TEST; - //Input for Javadoc return code test. private static final int EXPECTED_EXIT_CODE = 1; @@ -57,22 +50,8 @@ */ public static void main(String[] args) { TestDocErrorReporter tester = new TestDocErrorReporter(); - int actualExitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, NO_TEST, NO_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java --- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -39,45 +39,37 @@ public class TestDocFileDir extends JavadocTester { - private static final String BUG_ID = "4258405-4973606"; - private static final String[][] TEST1 = { - {BUG_ID + "-1" + FS + "pkg" + FS + "doc-files" + FS + "testfile.txt", + { "pkg/doc-files/testfile.txt", "This doc file did not get trashed."} }; - private static final String[][] NEGATED_TEST1 = NO_TEST; private static final String[] FILE_TEST2 = { - BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used1" + - FS + "testfile.txt", - BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used2" + - FS + "testfile.txt" + "pkg/doc-files/subdir-used1/testfile.txt", + "pkg/doc-files/subdir-used2/testfile.txt" }; private static final String[] FILE_NEGATED_TEST2 = { - BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded1" + - FS + "testfile.txt", - BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded2" + - FS + "testfile.txt" + "pkg/doc-files/subdir-excluded1/testfile.txt", + "pkg/doc-files/subdir-excluded2/testfile.txt" }; private static final String[][] TEST0 = { - {"pkg" + FS + "doc-files" + FS + "testfile.txt", + {"pkg/doc-files/testfile.txt", "This doc file did not get trashed."} }; - private static final String[][] NEGATED_TEST0 = {}; //Output dir = Input Dir private static final String[] ARGS1 = new String[] { - "-d", BUG_ID + "-1", + "-d", OUTPUT_DIR + "-1", "-sourcepath", - "blah" + File.pathSeparator + BUG_ID + "-1" + File.pathSeparator + "blah", - "pkg"}; + "blah" + File.pathSeparator + OUTPUT_DIR + "-1" + + File.pathSeparator + "blah", "pkg"}; //Exercising -docfilessubdirs and -excludedocfilessubdir private static final String[] ARGS2 = new String[] { - "-d", BUG_ID + "-2", + "-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, "-docfilessubdirs", "-excludedocfilessubdir", "subdir-excluded1:subdir-excluded2", @@ -85,7 +77,7 @@ //Output dir = "", Input dir = "" private static final String[] ARGS0 = - new String[] {"pkg" + FS + "C.java"}; + new String[] {"pkg/C.java"}; /** @@ -94,25 +86,11 @@ */ public static void main(String[] args) { TestDocFileDir tester = new TestDocFileDir(); - copyDir(SRC_DIR + FS + "pkg", "."); - run(tester, ARGS0, TEST0, NEGATED_TEST0); - copyDir(SRC_DIR + FS + "pkg", BUG_ID + "-1"); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2); + copyDir(SRC_DIR + "/pkg", "."); + tester.run(ARGS0, TEST0, NO_TEST); + copyDir(SRC_DIR + "/pkg", OUTPUT_DIR + "-1"); + tester.run(ARGS1, TEST1, NO_TEST); + tester.run(ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java --- a/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 @@ -33,9 +33,8 @@ public class TestDocFiles extends JavadocTester { - private static final String BUG_ID = "8008949"; private static final String[][] TEST = { - {"tmp" + FS + "pkg" + FS + "doc-files" + FS + "test.txt", "test file"}}; + { "pkg/doc-files/test.txt", "test file"}}; private static final String[] ARGS = new String[] { @@ -47,21 +46,7 @@ */ public static void main(String[] args) { TestDocFiles tester = new TestDocFiles(); - run(tester, ARGS, TEST, NO_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java --- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -36,27 +36,25 @@ public class TestDocRootInlineTag extends JavadocTester { - private static final String BUG_ID = "4369014-4851991"; private static final String[][] TEST = { - {BUG_ID + FS + "TestDocRootTag.html", + { "TestDocRootTag.html", "File"}, - {BUG_ID + FS + "TestDocRootTag.html", + { "TestDocRootTag.html", "glossary"}, - {BUG_ID + FS + "TestDocRootTag.html", + { "TestDocRootTag.html", "Second File Link"}, - {BUG_ID + FS + "TestDocRootTag.html", "The value of @docRoot is \"./\""}, - {BUG_ID + FS + "index-all.html", "My package page is " + + { "TestDocRootTag.html", "The value of @docRoot is \"./\""}, + { "index-all.html", "My package page is " + "here"} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-bottom", "The value of @docRoot is \"{@docRoot}\"", - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-linkoffline", "http://www.java.sun.com/j2se/1.4/docs/api", - SRC_DIR, SRC_DIR + FS + "TestDocRootTag.java", "pkg" + SRC_DIR, SRC_DIR + "/TestDocRootTag.java", "pkg" }; /** @@ -65,21 +63,7 @@ */ public static void main(String[] args) { TestDocRootInlineTag tester = new TestDocRootInlineTag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java --- a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -32,90 +32,93 @@ */ public class TestDocRootLink extends JavadocTester { - private static final String BUG_ID = "6553182"; private static final String[][] TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "Refer Here" }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", - "This Here should not be replaced" + NL + + { "pkg1/C1.html", + "This Here should not be replaced\n" + " with an absolute link." }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", - "Testing Link 1 and" + NL + + { "pkg1/C1.html", + "Testing Link 1 and\n" + " Link 2." }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "" + NL + + { "pkg1/package-summary.html", + "\n" + " Test document 1" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "" + NL + + { "pkg1/package-summary.html", + "\n" + " Another Test document 1" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "" + NL + + { "pkg1/package-summary.html", + "\n" + " Another Test document 2." } }; private static final String[][] NEGATED_TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" } }; private static final String[][] TEST2 = { - {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "Refer Here" }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", - "This Here should not be replaced" + NL + + { "pkg2/C2.html", + "This Here should not be replaced\n" + " with an absolute link." }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", - "Testing Link 1 and" + NL + + { "pkg2/C2.html", + "Testing Link 1 and\n" + " Link 2." }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "" + NL + + { "pkg2/package-summary.html", + "\n" + " Test document 1" }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "" + NL + " Another Test document 1" + { "pkg2/package-summary.html", + "\n" + + " Another Test document 1" }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "" + NL + " Another Test document 2." + { "pkg2/package-summary.html", + "\n" + + " Another Test document 2." } }; private static final String[][] NEGATED_TEST2 = { - {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "" }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "" }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "" }, - {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "" } }; private static final String[] ARGS1 = new String[]{ - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2" }; private static final String[] ARGS2 = new String[]{ - "-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" + "-d", OUTPUT_DIR + "-1", "-Xdocrootparent", + "http://download.oracle.com/javase/7/docs", "-sourcepath", + SRC_DIR, "pkg1", "pkg2" }; /** @@ -124,22 +127,8 @@ */ public static void main(String[] args) { TestDocRootLink tester = new TestDocRootLink(); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS2, TEST2, NEGATED_TEST2); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java --- a/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,10 +35,9 @@ public class TestDupParamWarn extends JavadocTester { - private static final String BUG_ID = "4745855"; private static final String[] ARGS = - new String[] {"-d", BUG_ID, "-sourcepath", - SRC_DIR + FS, "pkg"}; + new String[] {"-d", OUTPUT_DIR, "-sourcepath", + SRC_DIR + "/", "pkg"}; private static final String[][] NEGATED_TEST = new String[][] {{WARNING_OUTPUT, "Parameter \"a\" is documented more than once."}}; @@ -48,20 +47,8 @@ * @param args the array of command line arguments. */ public static void main(String[] args) { - run(new TestDupParamWarn(), ARGS, NO_TEST, NEGATED_TEST); - } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); + JavadocTester tester = new TestDupParamWarn(); + tester.run(ARGS, NO_TEST, NEGATED_TEST); + tester.printSummary(); } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java --- a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, 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 @@ -35,23 +35,20 @@ public class TestEmptyClass extends JavadocTester { - private static final String OUTPUT_DIR = "tmp"; - private static final String[][] TEST = NO_TEST; private static final String[][] NEGATED_TEST = { //The overview tree should not link to classes that were not documented - {OUTPUT_DIR + FS + "overview-tree.html", ""}, + { "overview-tree.html", ""}, //The index page should not link to classes that were not documented - {OUTPUT_DIR + FS + "index-all.html", ""}, + { "index-all.html", ""}, }; private static final String[] ARGS = new String[] { - "-classpath", SRC_DIR + FS + "src", - "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR + FS + "src", - SRC_DIR + FS + "src" + FS + "Empty.java" + "-classpath", SRC_DIR + "/src", + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR + "/src", + SRC_DIR + "/src/Empty.java" }; - private static final String BUG_ID = "4483401 4483407 4483409 4483413 4494343"; /** * The entry point of the test. @@ -59,24 +56,10 @@ */ public static void main(String[] args) { TestEmptyClass tester = new TestEmptyClass(); - int exitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int exitCode = tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); if (exitCode != 0) { throw new Error("Error found while executing Javadoc"); } } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java --- a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -34,19 +34,15 @@ public class TestEnclosingClass extends JavadocTester { - //Test information. - private static final String BUG_ID = "5008230"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "MyClass.MyInterface.html", "Enclosing class:"} + { "pkg/MyClass.MyInterface.html", "Enclosing class:"} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -54,21 +50,7 @@ */ public static void main(String[] args) { TestEnclosingClass tester = new TestEnclosingClass(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java --- a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,17 +35,15 @@ public class TestEncoding extends JavadocTester { - private static final String BUG_ID = "4661481"; - private static final String[][] TEST = NO_TEST; //If ??? is found in the output, the source file was not read with the correct encoding setting. private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "EncodeTest.html", "??"} + { "EncodeTest.html", "??"} }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, - "-encoding", "iso-8859-1", SRC_DIR + FS + "EncodeTest.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, + "-encoding", "iso-8859-1", SRC_DIR + "/EncodeTest.java" }; /** @@ -54,21 +52,7 @@ */ public static void main(String[] args) { TestEncoding tester = new TestEncoding(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java --- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,28 +35,23 @@ public class TestExternalOverridenMethod extends JavadocTester { - private static final String BUG_ID = "4857717"; private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "XReader.html", - "
Overrides:
" + NL + + { "pkg/XReader.html", + "
Overrides:
\n" + "
read in class " + "FilterReader
"}, - {BUG_ID + FS + "pkg" + FS + "XReader.html", - "
Specified by:
" + NL + + { "pkg/XReader.html", + "
Specified by:
\n" + "
readInt in interface " + "DataInput
"}}; - - - private static final String[][] NEGATED_TEST = NO_TEST; - private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-linkoffline", "http://java.sun.com/j2se/1.4.1/docs/api", SRC_DIR, "pkg" }; @@ -67,21 +62,7 @@ */ public static void main(String[] args) { TestExternalOverridenMethod tester = new TestExternalOverridenMethod(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java --- a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2014, 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 @@ -32,8 +32,6 @@ public class TestGeneratedBy extends JavadocTester { - private static final String OUTPUT_DIR = "tmp"; - private static final String[] FILES = { "pkg/MyClass.html", "pkg/package-summary.html", @@ -65,7 +63,6 @@ "pkg" }; - private static final String BUG_ID = "8000418-8024288"; private static String[][] getTests(boolean timestamp) { String version = System.getProperty("java.version"); @@ -74,7 +71,7 @@ String genBy = "Generated by javadoc"; if (timestamp) genBy += " (" + version + ") on "; tests[i] = new String[] { - OUTPUT_DIR + FS + FILES[i], genBy + FILES[i], genBy }; } return tests; @@ -84,7 +81,7 @@ String[][] tests = new String[FILES.length][]; for (int i = 0; i < FILES.length; i++) { tests[i] = new String[] { - OUTPUT_DIR + FS + FILES[i], + FILES[i], (timestamp ? "Generated by javadoc (version" : "Generated by javadoc ("), @@ -100,26 +97,12 @@ */ public static void main(String[] args) { TestGeneratedBy tester = new TestGeneratedBy(); - int ec1 = run(tester, STD_ARGS, getTests(true), getNegatedTests(true)); - int ec2 = run(tester, NO_TIMESTAMP_ARGS, getTests(false), getNegatedTests(false)); + int ec1 = tester.run(STD_ARGS, getTests(true), getNegatedTests(true)); + int ec2 = tester.run(NO_TIMESTAMP_ARGS, getTests(false), getNegatedTests(false)); tester.printSummary(); if (ec1 != 0 || ec2 != 0) { throw new Error("Error found while executing Javadoc"); } } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java --- a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,12 +35,9 @@ public class TestGroupOption extends JavadocTester { - //Test information. - private static final String BUG_ID = "4924383"; - //Javadoc arguments. private static final String[] ARGS1 = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-group", "Package One", "pkg1", "-group", "Package Two", "pkg2", "-group", "Package Three", "pkg3", @@ -48,7 +45,7 @@ }; private static final String[] ARGS2 = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-group", "Package One", "pkg1", "-group", "Package One", "pkg2", "-group", "Package One", "pkg3", @@ -56,11 +53,9 @@ }; //Input for string search tests. - private static final String[][] TEST1 = NO_TEST; private static final String[][] NEGATED_TEST1 = {{WARNING_OUTPUT, "-group"}}; private static final String[][] TEST2 = {{WARNING_OUTPUT, "-group"}}; - private static final String[][] NEGATED_TEST2 = NO_TEST; /** * The entry point of the test. @@ -69,26 +64,12 @@ public static void main(String[] args) { //Make sure the warning is not printed when -group is used correctly. TestGroupOption tester = new TestGroupOption(); - run(tester, ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS1, NO_TEST, NEGATED_TEST1); tester.printSummary(); //Make sure the warning is printed when -group is not used correctly. tester = new TestGroupOption(); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS2, TEST2, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java --- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -34,82 +34,79 @@ public class TestHeadings extends JavadocTester { - //Test information. - private static final String BUG_ID = "4905786-6259611"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "-header", "Test Files", + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "-header", "Test Files", "pkg1", "pkg2" }; //Input for string search tests. private static final String[][] TEST = { //Package summary - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" + - "Class" + NL + "\n" + + "Description" }, // Class documentation - {BUG_ID + FS + "pkg1" + FS + "C1.html", - "Modifier and Type" + NL + + { "pkg1/C1.html", + "Modifier and Type\n" + "Field and Description" }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "
Methods inherited from class java.lang.Object
" }, // Class use documentation - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", - "Package" + NL + + { "pkg1/class-use/C1.html", + "Package\n" + "Description" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", - "Modifier and Type" + NL + + { "pkg1/class-use/C1.html", + "Modifier and Type\n" + "Field and Description" }, // Deprecated - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "Method and Description" }, // Constant values - {BUG_ID + FS + "constant-values.html", + { "constant-values.html", "" + - "Modifier and Type" + NL + "Constant Field" + NL + + "Modifier and Type\n" + + "Constant Field\n" + "Value" }, // Serialized Form - {BUG_ID + FS + "serialized-form.html", + { "serialized-form.html", "
Package pkg1
" }, - {BUG_ID + FS + "serialized-form.html", + { "serialized-form.html", "
Class " + "pkg1.C1 extends java.lang.Object implements Serializable
" }, - {BUG_ID + FS + "serialized-form.html", + { "serialized-form.html", "
Serialized Fields
" }, // Overview Frame - {BUG_ID + FS + "overview-frame.html", + { "overview-frame.html", "
Test Files
" }, - {BUG_ID + FS + "overview-frame.html", + { "overview-frame.html", "Overview List" }, // Overview Summary - {BUG_ID + FS + "overview-summary.html", + { "overview-summary.html", "Overview" - }, - + } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -117,21 +114,7 @@ */ public static void main(String[] args) { TestHeadings tester = new TestHeadings(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java --- a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2014, 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 @@ -33,19 +33,14 @@ public class TestHelpFile extends JavadocTester { - //Test information. - private static final String BUG_ID = "7132631"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, - SRC_DIR + FS + "TestHelpFile.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, + SRC_DIR + "/TestHelpFile.java" }; - private static final String[][] NEGATED_TEST = NO_TEST; - private static final String[][] TEST = { - {BUG_ID + FS + "help-doc.html", + { "help-doc.html", "Constant Field Values" }, }; @@ -56,21 +51,7 @@ */ public static void main(String[] args) { TestHelpFile tester = new TestHelpFile(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java --- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -34,18 +34,15 @@ public class TestHelpOption extends JavadocTester { - //Test information. - private static final String BUG_ID = "4934778-4777599-6553182"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-help", - SRC_DIR + FS + "TestHelpOption.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-help", + SRC_DIR + "/TestHelpOption.java" }; private static final String[] ARGS2 = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, - SRC_DIR + FS + "TestHelpOption.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, + SRC_DIR + "/TestHelpOption.java" }; private static final String[][] TEST = { @@ -86,14 +83,12 @@ {STANDARD_OUTPUT, "-stylesheetfile "}, {STANDARD_OUTPUT, "-docencoding "}, }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[][] TEST2 = { - {BUG_ID + FS + "TestHelpOption.html", + { "TestHelpOption.html", "
Help
" }, }; - private static final String[][] NEGATED_TEST2 = NO_TEST; //The help option should not crash the doclet. private static final int EXPECTED_EXIT_CODE = 0; @@ -104,23 +99,9 @@ */ public static void main(String[] args) { TestHelpOption tester = new TestHelpOption(); - int actualExitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, TEST, NO_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS2, TEST2, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java --- a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,18 +35,16 @@ public class TestHiddenMembers extends JavadocTester { - private static final String BUG_ID = "4492178"; - private static final String[][] TEST = NO_TEST; //We should not inherit any members from BaseClass because they are all overriden and hidden //(declared as private). private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "pkg" + FS + "SubClass.html", + { "pkg/SubClass.html", "inherited from class pkg.BaseClass"} }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg" }; @@ -56,21 +54,7 @@ */ public static void main(String[] args) { TestHiddenMembers tester = new TestHiddenMembers(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHref/TestHref.java --- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -33,53 +33,51 @@ public class TestHref extends JavadocTester { - //Test information. - private static final String BUG_ID = "4663254"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-linkoffline", + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/", SRC_DIR, "pkg" }; //Input for string search tests. private static final String[][] TEST = { //External link. - {BUG_ID + FS + "pkg" + FS + "C1.html", + { "pkg/C1.html", "href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait-long-int-\"" }, //Member summary table link. - {BUG_ID + FS + "pkg" + FS + "C1.html", + { "pkg/C1.html", "href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\"" }, //Anchor test. - {BUG_ID + FS + "pkg" + FS + "C1.html", - "" + NL + - "" + NL + + { "pkg/C1.html", + "\n" + + "\n" + "" }, //Backward compatibility anchor test. - {BUG_ID + FS + "pkg" + FS + "C1.html", - "" + NL + - "" + NL + + { "pkg/C1.html", + "\n" + + "\n" + "" }, //{@link} test. - {BUG_ID + FS + "pkg" + FS + "C2.html", + { "pkg/C2.html", "Link: " }, //@see test. - {BUG_ID + FS + "pkg" + FS + "C2.html", - "See Also:" + NL + "
" + { "pkg/C2.html", + "See Also:\n" + + "
" }, //Header does not link to the page itself. - {BUG_ID + FS + "pkg" + FS + "C4.html", + { "pkg/C4.html", "Class C4<E extends C4<E>>" }, //Signature does not link to the page itself. - {BUG_ID + FS + "pkg" + FS + "C4.html", + { "pkg/C4.html", "public abstract class C4<E extends C4<E>>" }, }; @@ -94,21 +92,7 @@ */ public static void main(String[] args) { TestHref tester = new TestHref(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java --- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,12 +35,9 @@ public class TestHrefInDocComment extends JavadocTester { - private static final String BUG_ID = "4638015"; - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"}; /** * The entry point of the test. @@ -48,23 +45,8 @@ */ public static void main(String[] args) { TestHrefInDocComment tester = new TestHrefInDocComment(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, NO_TEST, NO_TEST) != 0) { throw new Error("Javadoc failed to execute properly with given source."); } - - } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java --- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,18 +35,14 @@ public class TestHtmlComments extends JavadocTester { - //Test information. - private static final String BUG_ID = "4904038"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java" }; //Input for string search tests. - private static final String[][] TEST = NO_TEST; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "C.html", + { "C.html", ""} }; @@ -56,21 +52,7 @@ */ public static void main(String[] args) { TestHtmlComments tester = new TestHtmlComments(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java --- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 @@ -35,84 +35,131 @@ public class TestHtmlDefinitionListTag extends JavadocTester { - private static final String BUG_ID = "6786690-6820360"; - // Test common to all runs of javadoc. The class signature should print // properly enclosed definition list tags and the Annotation Type // Optional Element should print properly nested definition list tags // for default value. private static final String[][] TEST_ALL = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
public class " + - "C1" + NL + - "extends java.lang.Object" + NL + "implements java.io.Serializable
"}, - {BUG_ID + FS + "pkg1" + FS + "C4.html", "
" + NL + - "
Default:
" + NL + "
true
" + NL + + { "pkg1/C1.html", "
public class " + + "C1\n" + + "extends java.lang.Object\n" + + "implements java.io.Serializable
"}, + { "pkg1/C4.html", "
\n" + + "
Default:
\n" + + "
true
\n" + "
"}}; // Test for normal run of javadoc in which various ClassDocs and // serialized form should have properly nested definition list tags // enclosing comments, tags and deprecated information. private static final String[][] TEST_CMNT_DEPR = { - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "
" + NL + - "
Since:
" + NL + - "
JDK1.0
" + NL + "
"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
" + NL + "
Since:
" + NL + - "
JDK1.0
" + NL + "
See Also:
" + NL + + { "pkg1/package-summary.html", "
\n" + + "
Since:
\n" + + "
JDK1.0
\n" + + "
"}, + { "pkg1/C1.html", "
\n" + + "
Since:
\n" + + "
JDK1.0
\n" + + "
See Also:
\n" + "
" + - "C2, " + NL + "" + - "Serialized Form
" + NL + "
"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
" + NL + "
Since:
" + NL + - "
1.4
" + NL + - "
See Also:
" + NL + "
" + + "C2, \n" + + "" + + "Serialized Form
\n" + + "
"}, + { "pkg1/C1.html", "
\n" + + "
Since:
\n" + + "
1.4
\n" + + "
See Also:
\n" + + "
" + "" + - "setUndecorated(boolean)
" + NL + "
"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
"+ NL + "
Parameters:
" + NL + "
title" + - " - the title
" + NL + "
test - boolean value" + - "
" + NL + "
Throws:
" + NL + + "setUndecorated(boolean)
\n" + + "
Overrides:
Overrides:: read in class " + "FilterReader
Specified by:
Specified by:: readInt in interface " + "DataInput; " + { "pkg/C2.html", + "See Also:\n" + + "; " }, //Header does not link to the page itself. - {BUG_ID + FS + "pkg" + FS + "C4.html", + { "pkg/C4.html", "Class C4<E extends C4<E>>" }, //Signature does not link to the page itself. - {BUG_ID + FS + "pkg" + FS + "C4.html", + { "pkg/C4.html", "public abstract class C4<E extends C4<E>>" }, }; @@ -94,21 +92,7 @@ */ public static void main(String[] args) { TestHref tester = new TestHref(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java --- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,12 +35,9 @@ public class TestHrefInDocComment extends JavadocTester { - private static final String BUG_ID = "4638015"; - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"}; /** * The entry point of the test. @@ -48,23 +45,8 @@ */ public static void main(String[] args) { TestHrefInDocComment tester = new TestHrefInDocComment(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, NO_TEST, NO_TEST) != 0) { throw new Error("Javadoc failed to execute properly with given source."); } - - } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java --- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,18 +35,14 @@ public class TestHtmlComments extends JavadocTester { - //Test information. - private static final String BUG_ID = "4904038"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java" }; //Input for string search tests. - private static final String[][] TEST = NO_TEST; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "C.html", + { "C.html", ""} }; @@ -56,21 +52,7 @@ */ public static void main(String[] args) { TestHtmlComments tester = new TestHtmlComments(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java --- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 @@ -35,84 +35,131 @@ public class TestHtmlDefinitionListTag extends JavadocTester { - private static final String BUG_ID = "6786690-6820360"; - // Test common to all runs of javadoc. The class signature should print // properly enclosed definition list tags and the Annotation Type // Optional Element should print properly nested definition list tags // for default value. private static final String[][] TEST_ALL = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
public class " + - "C1" + NL + - "extends java.lang.Object" + NL + "implements java.io.Serializable
"}, - {BUG_ID + FS + "pkg1" + FS + "C4.html", "
" + NL + - "
Default:
" + NL + "
true
" + NL + + { "pkg1/C1.html", "
public class " + + "C1\n" + + "extends java.lang.Object\n" + + "implements java.io.Serializable
"}, + { "pkg1/C4.html", "
\n" + + "
Default:
\n" + + "
true
\n" + "
"}}; // Test for normal run of javadoc in which various ClassDocs and // serialized form should have properly nested definition list tags // enclosing comments, tags and deprecated information. private static final String[][] TEST_CMNT_DEPR = { - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "
" + NL + - "
Since:
" + NL + - "
JDK1.0
" + NL + "
"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
" + NL + "
Since:
" + NL + - "
JDK1.0
" + NL + "
See Also:
" + NL + + { "pkg1/package-summary.html", "
\n" + + "
Since:
\n" + + "
JDK1.0
\n" + + "
"}, + { "pkg1/C1.html", "
\n" + + "
Since:
\n" + + "
JDK1.0
\n" + + "
See Also:
\n" + "
" + - "C2, " + NL + "" + - "Serialized Form
" + NL + "
"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
" + NL + "
Since:
" + NL + - "
1.4
" + NL + - "
See Also:
" + NL + "
" + + "C2, \n" + + "" + + "Serialized Form
\n" + + "
"}, + { "pkg1/C1.html", "
\n" + + "
Since:
\n" + + "
1.4
\n" + + "
See Also:
\n" + + "
" + "" + - "setUndecorated(boolean)
" + NL + "
"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "
"+ NL + "
Parameters:
" + NL + "
title" + - " - the title
" + NL + "
test - boolean value" + - "
" + NL + "
Throws:
" + NL + + "setUndecorated(boolean)

"}, + { "pkg1/C1.html", "

Parameters:: title" + + " - the title; test - boolean value" + + "
Throws:: java.lang.IllegalArgumentException - if the " + - "owner's" + NL + + "owner's\n" + " GraphicsConfiguration is not from a screen " + - "device; HeadlessException

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

Parameters:: undecorated" + - " - true if no decorations are" + NL + - " to be enabled;" + NL + " false " + - "if decorations are to be enabled.
Since:" + - ": 1.4
See Also:: " + + "device; HeadlessException

"}, + { "pkg1/C1.html", "

Parameters:: undecorated" + + " - true if no decorations are\n" + + " to be enabled;\n" + + " false " + + "if decorations are to be enabled.
Since:" + + ": 1.4
See Also:: " + "readObject()" + - "

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

Throws:: java.io.IOException
See Also:" + - ": " + - "setUndecorated(boolean)

"}, - {BUG_ID + FS + "pkg1" + FS + "C2.html", "

Parameters:" + - ": set - boolean
" + - "Since:: 1.4

"}, - {BUG_ID + FS + "serialized-form.html", "

Throws:" + - ": " + - "java.io.IOException
See Also:" + - ": " + - "C1.setUndecorated(boolean)

"}, - {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + "\n" + + ""}, + { "pkg1/C1.html", "

Throws:: java.io.IOException
See Also:" + + ": " + + "setUndecorated(boolean)

"}, + { "pkg1/C2.html", "

Parameters:" + + ": set - boolean
" + + "Since:: 1.4

"}, + { "serialized-form.html", "

Throws:" + + ": " + + "java.io.IOException
See Also:" + + ": " + + "C1.setUndecorated(boolean)

"}, + { "serialized-form.html", + "Deprecated." + + " As of JDK version 1.5, replaced by\n" + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean).\n" + "

This field indicates whether the C1 is " + - "undecorated.

" + NL + " " + NL + "

Since:: 1.4
See Also:" + - ": " + - "C1.setUndecorated(boolean)

"}, - {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + "undecorated.\n" + + " \n" + + "

Since:: 1.4
See Also:" + + ": " + + "C1.setUndecorated(boolean)

"}, + { "serialized-form.html", + "Deprecated." + + " As of JDK version 1.5, replaced by\n" + " " + - "setUndecorated(boolean)." + NL + - "

Reads the object stream.

" + NL + - "

Throws:" + - ": " + - "IOException; java.io.IOException

"}, - {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " " + NL + + "setUndecorated(boolean).\n" + + "

Reads the object stream.

\n" + + "

Throws:" + + ": " + + "IOException; java.io.IOException

"}, + { "serialized-form.html", + "Deprecated." + + " \n" + "

The name for this class.

"}}; // Test with -nodeprecated option. The ClassDocs should have properly nested @@ -121,120 +168,184 @@ // should display properly nested definition list tags for comments, tags // and deprecated information. private static final String[][] TEST_NODEPR = { - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "

Since:: JDK1.0

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

Since:" + - ": JDK1.0
See Also:" + - ": " + - "C2, " + NL + "" + - "Serialized Form

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

Parameters:" + - ": title - the title; " + - "test - boolean value
Throws:" + - ": java.lang.IllegalArgumentException" + - " - if the owner's" + NL + " GraphicsConfiguration" + - " is not from a screen device; " + - "HeadlessException

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

Parameters:" + - "

undecorated - true" + - " if no decorations are" + NL + " to be enabled;" + NL + + { "pkg1/package-summary.html", "

Since:: JDK1.0

"}, + { "pkg1/C1.html", "

Since:" + + ": JDK1.0
See Also:" + + ": " + + "C2, \n" + + "" + + "Serialized Form

"}, + { "pkg1/C1.html", "

Parameters:" + + ": title - the title; " + + "test - boolean value
Throws:" + + ": java.lang.IllegalArgumentException" + + " - if the owner's\n" + + " GraphicsConfiguration" + + " is not from a screen device; " + + "HeadlessException

"}, + { "pkg1/C1.html", "

Parameters:" + + ": undecorated - true" + + " if no decorations are\n" + + " to be enabled;\n" + " false if decorations are to be enabled." + - "
Since:: 1.4
See Also:: " + - "readObject()

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

Throws:" + - ": java.io.IOException
" + - "See Also:: " + - "setUndecorated(boolean)

"}, - {BUG_ID + FS + "serialized-form.html", "

Throws:" + - ": " + - "java.io.IOException
See Also:" + - ": " + - "C1.setUndecorated(boolean)

"}, - {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + "

Since:

1.4

See Also:

" + + "readObject()

"}, + { "pkg1/C1.html", "

Throws:" + + ": java.io.IOException
" + + "See Also:: " + + "setUndecorated(boolean)

"}, + { "serialized-form.html", "

Throws:" + + ": " + + "java.io.IOException
See Also:" + + ": " + + "C1.setUndecorated(boolean)

"}, + { "serialized-form.html", + "Deprecated." + + " As of JDK version 1.5, replaced by\n" + " " + - "setUndecorated(boolean)." + NL + + "setUndecorated(boolean).\n" + "

This field indicates whether the C1 is " + - "undecorated.

" + NL + " " + NL + "

Since:: 1.4
See Also:" + - ": " + - "C1.setUndecorated(boolean)

"}, - {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " As of JDK version 1.5, replaced by" + NL + + "undecorated.\n" + + " \n" + + "

Since:: 1.4
See Also:" + + ": " + + "C1.setUndecorated(boolean)

"}, + { "serialized-form.html", + "Deprecated." + + " As of JDK version 1.5, replaced by\n" + " " + - "setUndecorated(boolean)." + NL + - "

Reads the object stream.

" + NL + - "

Throws:" + - ": " + - "IOException; java.io.IOException

"}, - {BUG_ID + FS + "serialized-form.html", "Deprecated." + - " " + NL + "

" + + "setUndecorated(boolean).

\n" + + "

Reads the object stream.

\n" + + "

Throws:" + + ": " + + "IOException; java.io.IOException

"}, + { "serialized-form.html", + "Deprecated." + + " \n" + + "

" + "The name for this class.

"}}; // Test with -nocomment and -nodeprecated options. The ClassDocs whould // not display definition lists for any member details. private static final String[][] TEST_NOCMNT_NODEPR = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

public void readObject()" + NL +
-                 "                throws java.io.IOException

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C2.html", "

public C2()

" + NL + + { "pkg1/C1.html", + "

public void readObject()\n" +
+                 "                throws java.io.IOException

\n" + ""}, - {BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "

public " +
+        { "pkg1/C2.html", "public C2()\n" +
+                 ""},
+        { "pkg1/C1.ModalExclusionType.html", "public " +
                  "static final C1.ModalExclusionType " +
-                 "APPLICATION_EXCLUDE" + NL + ""},
-        {BUG_ID + FS + "serialized-form.html", "boolean " +
-                 "undecorated
" + NL + "" +
-                 "Deprecated. As of JDK version 1.5, replaced by" + NL +
+                 "APPLICATION_EXCLUDE

\n" + + ""}, + { "serialized-form.html", "

boolean " +
+                 "undecorated

\n" + + "

" + + "Deprecated. As of JDK version 1.5, replaced by\n" + " " + - "setUndecorated(boolean).

" + NL + ""}, - {BUG_ID + FS + "serialized-form.html", "" + + "setUndecorated(boolean).\n" + + ""}, + { "serialized-form.html", "" + "Deprecated. As of JDK version" + - " 1.5, replaced by" + NL + + " 1.5, replaced by\n" + " " + - "setUndecorated(boolean)." + NL + ""}}; + "setUndecorated(boolean).\n" + + ""}}; // Test for valid HTML generation which should not comprise of empty // definition list tags. private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C2.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C2.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C2.ModalType.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C2.ModalType.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C3.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C3.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C4.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C4.html", "

" + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "C5.html", "

"}, - {BUG_ID + FS + "pkg1" + FS + "C5.html", "

" + NL + ""}, - {BUG_ID + FS + "overview-tree.html", "

"}, - {BUG_ID + FS + "overview-tree.html", "

" + NL + ""}, - {BUG_ID + FS + "serialized-form.html", "

"}, - {BUG_ID + FS + "serialized-form.html", "

" + NL + ""}}; + { "pkg1/package-summary.html", "

"}, + { "pkg1/package-summary.html", "

\n" + + ""}, + { "pkg1/C1.html", "

"}, + { "pkg1/C1.html", "

\n" + + ""}, + { "pkg1/C1.ModalExclusionType.html", "

"}, + { "pkg1/C1.ModalExclusionType.html", "

\n" + + ""}, + { "pkg1/C2.html", "

"}, + { "pkg1/C2.html", "

\n" + + ""}, + { "pkg1/C2.ModalType.html", "

"}, + { "pkg1/C2.ModalType.html", "

\n" + + ""}, + { "pkg1/C3.html", "

"}, + { "pkg1/C3.html", "

\n" + + ""}, + { "pkg1/C4.html", "

"}, + { "pkg1/C4.html", "

\n" + + ""}, + { "pkg1/C5.html", "

"}, + { "pkg1/C5.html", "

\n" + + ""}, + { "overview-tree.html", "

"}, + { "overview-tree.html", "

\n" + + ""}, + { "serialized-form.html", "

"}, + { "serialized-form.html", "

\n" + + ""}}; private static final String[] ARGS1 = new String[] { - "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"}; + "-Xdoclint:none", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"}; private static final String[] ARGS2 = new String[] { - "-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-sourcepath", SRC_DIR, "pkg1"}; + "-Xdoclint:none", "-d", OUTPUT_DIR, "-nocomment", "-sourcepath", + SRC_DIR, "pkg1"}; private static final String[] ARGS3 = new String[] { - "-Xdoclint:none", "-d", BUG_ID, "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"}; + "-Xdoclint:none", "-d", OUTPUT_DIR, "-nodeprecated", "-sourcepath", + SRC_DIR, "pkg1"}; private static final String[] ARGS4 = new String[] { - "-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"}; + "-Xdoclint:none", "-d", OUTPUT_DIR, "-nocomment", "-nodeprecated", + "-sourcepath", SRC_DIR, "pkg1"}; /** * The entry point of the test. @@ -242,29 +353,14 @@ */ public static void main(String[] args) { TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag(); - tester.exactNewlineMatch = false; - run(tester, ARGS1, TEST_ALL, NEGATED_TEST); - run(tester, ARGS1, TEST_CMNT_DEPR, NEGATED_TEST); - run(tester, ARGS2, TEST_ALL, NEGATED_TEST); - run(tester, ARGS2, NO_TEST, TEST_CMNT_DEPR); - run(tester, ARGS3, TEST_ALL, NEGATED_TEST); - run(tester, ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR); - run(tester, ARGS4, TEST_ALL, NEGATED_TEST); - run(tester, ARGS4, TEST_NOCMNT_NODEPR, TEST_CMNT_DEPR); + tester.run(ARGS1, TEST_ALL, NEGATED_TEST); + tester.run(ARGS1, TEST_CMNT_DEPR, NEGATED_TEST); + tester.run(ARGS2, TEST_ALL, NEGATED_TEST); + tester.run(ARGS2, NO_TEST, TEST_CMNT_DEPR); + tester.run(ARGS3, TEST_ALL, NEGATED_TEST); + tester.run(ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR); + tester.run(ARGS4, TEST_ALL, NEGATED_TEST); + tester.run(ARGS4, TEST_NOCMNT_NODEPR, TEST_CMNT_DEPR); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java --- a/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2014, 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 @@ -41,16 +41,16 @@ */ public class TestHtmlDocument { + protected static final String NL = System.getProperty("line.separator"); + private static final String BUGID = "6851834"; private static final String BUGNAME = "TestHtmlDocument"; - private static final String FS = System.getProperty("file.separator"); - private static final String LS = System.getProperty("line.separator"); private static String srcdir = System.getProperty("test.src", "."); // Entry point public static void main(String[] args) throws IOException { // Check whether the generated markup is same as the existing markup. - if (generateHtmlTree().equals(readFileToString(srcdir + FS + "testMarkup.html"))) { + if (generateHtmlTree().equals(readFileToString(srcdir + "/testMarkup.html"))) { System.out.println("\nTest passed for bug " + BUGID + " (" + BUGNAME + ")\n"); } else { throw new Error("\nTest failed for bug " + BUGID + " (" + BUGNAME + ")\n"); @@ -150,7 +150,7 @@ String line; while ((line = in.readLine()) != null) { fileString.append(line); - fileString.append(LS); + fileString.append(NL); } } finally { in.close(); diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java --- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, 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 @@ -36,25 +36,27 @@ public class TestHtmlStrongTag extends JavadocTester { - private static final String BUG_ID = "6786028"; private static final String[][] TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", "See Also:"}}; + { "pkg1/C1.html", + "See Also:"}}; private static final String[][] NEGATED_TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", "Method Summary"}, - {BUG_ID + FS + "pkg1" + FS + "C1.html", ""}, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "Class Summary"}}; + { "pkg1/C1.html", "Method Summary"}, + { "pkg1/C1.html", ""}, + { "pkg1/package-summary.html", + "Class Summary"}}; private static final String[][] TEST2 = { - {BUG_ID + FS + "pkg2" + FS + "C2.html", "Comments:"}}; + { "pkg2/C2.html", "Comments:"}}; private static final String[][] NEGATED_TEST2 = { - {BUG_ID + FS + "pkg2" + FS + "C2.html", "Method Summary"}, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", "Class Summary"}}; + { "pkg2/C2.html", "Method Summary"}, + { "pkg1/package-summary.html", + "Class Summary"}}; private static final String[] ARGS1 = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"}; private static final String[] ARGS2 = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg2"}; /** * The entry point of the test. @@ -62,22 +64,8 @@ */ public static void main(String[] args) { TestHtmlStrongTag tester = new TestHtmlStrongTag(); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS2, TEST2, NEGATED_TEST2); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java --- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 @@ -33,47 +33,45 @@ public class TestHtmlTableStyles extends JavadocTester { - private static final String BUG_ID = "8008164"; - //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg1" + FS + "TestTable.html", + { "pkg1/TestTable.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "TestTable.html", + { "pkg1/TestTable.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "TestTable.html", + { "pkg1/TestTable.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "TestTable.html", + { "pkg1/TestTable.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "TestTable.html", + { "pkg1/class-use/TestTable.html", "
" }, - {BUG_ID + FS + "overview-summary.html", + { "overview-summary.html", "
" }, - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "
" }, - {BUG_ID + FS + "constant-values.html", + { "constant-values.html", "
" @@ -81,7 +79,7 @@ }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" }; /** @@ -90,21 +88,7 @@ */ public static void main(String[] args) throws Exception { TestHtmlTableStyles tester = new TestHtmlTableStyles(); - run(tester, ARGS, TEST, NO_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java --- a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 @@ -34,12 +34,9 @@ public class TestHtmlTableTags extends JavadocTester { - //Test information. - private static final String BUG_ID = "6786688"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2" }; //Input for string tests for HTML table tags. @@ -49,127 +46,127 @@ */ //Package summary - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "
" }, // Class documentation - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html", + { "pkg2/C2.ModalExclusionType.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "C3.html", + { "pkg2/C3.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "C4.html", + { "pkg2/C4.html", "
" }, // Class use documentation - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html", + { "pkg1/class-use/I1.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", + { "pkg1/class-use/C1.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", + { "pkg1/class-use/C1.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", + { "pkg2/class-use/C2.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", + { "pkg2/class-use/C2.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", + { "pkg2/class-use/C2.ModalExclusionType.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", + { "pkg2/class-use/C2.ModalExclusionType.html", "
" }, // Package use documentation - {BUG_ID + FS + "pkg1" + FS + "package-use.html", + { "pkg1/package-use.html", "
" }, - {BUG_ID + FS + "pkg1" + FS + "package-use.html", + { "pkg1/package-use.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "package-use.html", + { "pkg2/package-use.html", "
" }, - {BUG_ID + FS + "pkg2" + FS + "package-use.html", + { "pkg2/package-use.html", "
" }, // Deprecated - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "
" }, - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "
" }, // Constant values - {BUG_ID + FS + "constant-values.html", + { "constant-values.html", "
" }, // Overview Summary - {BUG_ID + FS + "overview-summary.html", + { "overview-summary.html", "
" @@ -180,27 +177,27 @@ */ //Package summary - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "" }, // Class documentation - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", + { "pkg1/C1.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html", + { "pkg2/C2.ModalExclusionType.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C3.html", + { "pkg2/C3.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C4.html", + { "pkg2/C4.html", "" }, // Class use documentation - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html", + { "pkg1/class-use/I1.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", + { "pkg1/class-use/C1.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", + { "pkg1/class-use/C1.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", + { "pkg2/class-use/C2.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", + { "pkg2/class-use/C2.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", + { "pkg2/class-use/C2.ModalExclusionType.html", "" }, // Package use documentation - {BUG_ID + FS + "pkg1" + FS + "package-use.html", + { "pkg1/package-use.html", "" }, - {BUG_ID + FS + "pkg1" + FS + "package-use.html", + { "pkg1/package-use.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "package-use.html", + { "pkg2/package-use.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "package-use.html", + { "pkg2/package-use.html", "" }, // Deprecated - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "" }, - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "" }, // Constant values - {BUG_ID + FS + "constant-values.html", + { "constant-values.html", "" }, // Overview Summary - {BUG_ID + FS + "overview-summary.html", + { "overview-summary.html", "" }, @@ -307,119 +304,124 @@ */ //Package summary - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" + NL + "" }, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", + { "pkg1/package-summary.html", "" + NL + "" }, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "" + NL + "" }, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", + { "pkg2/package-summary.html", "" + NL + "" }, // Class documentation - {BUG_ID + FS + "pkg1" + FS + "C1.html", - "" + NL + + { "pkg1/C1.html", + "\n" + "" }, - {BUG_ID + FS + "pkg1" + FS + "C1.html", - "" + NL + + { "pkg1/C1.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "C2.html", - "" + NL + + { "pkg2/C2.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "C2.html", + { "pkg2/C2.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html", + { "pkg2/C2.ModalExclusionType.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "C3.html", - "" + NL + + { "pkg2/C3.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "C4.html", - "" + NL + + { "pkg2/C4.html", + "\n" + "" }, // Class use documentation - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html", - "" + NL + + { "pkg1/class-use/I1.html", + "\n" + "" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", - "" + NL + + { "pkg1/class-use/C1.html", + "\n" + "" }, - {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html", - "" + NL + + { "pkg1/class-use/C1.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", - "" + NL + + { "pkg2/class-use/C2.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html", - "" + NL + + { "pkg2/class-use/C2.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", - "" + NL + + { "pkg2/class-use/C2.ModalExclusionType.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html", - "" + NL + + { "pkg2/class-use/C2.ModalExclusionType.html", + "\n" + "" }, // Package use documentation - {BUG_ID + FS + "pkg1" + FS + "package-use.html", - "" + NL + + { "pkg1/package-use.html", + "\n" + "" }, - {BUG_ID + FS + "pkg1" + FS + "package-use.html", + { "pkg1/package-use.html", "" }, - {BUG_ID + FS + "pkg2" + FS + "package-use.html", - "" + NL + + { "pkg2/package-use.html", + "\n" + "" }, - {BUG_ID + FS + "pkg2" + FS + "package-use.html", + { "pkg2/package-use.html", "" }, // Deprecated - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "" }, - {BUG_ID + FS + "deprecated-list.html", + { "deprecated-list.html", "" }, // Constant values - {BUG_ID + FS + "constant-values.html", + { "constant-values.html", "" + NL + "Constant Field" + NL + + "Modifier and Type\n" + + "Constant Field\n" + "" }, // Overview Summary - {BUG_ID + FS + "overview-summary.html", + { "overview-summary.html", "" + NL + "" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -427,21 +429,7 @@ */ public static void main(String[] args) { TestHtmlTableTags tester = new TestHtmlTableTags(); - run(tester, ARGS, TABLE_TAGS_TEST, NEGATED_TEST); + tester.run(ARGS, TABLE_TAGS_TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java --- a/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2014, 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 @@ -38,32 +38,33 @@ public class TestHtmlTag extends JavadocTester { - private static final String BUG_ID = "6786682"; private static final String[][] TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", ""}, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", ""}}; + { "pkg1/C1.html", + ""}, + { "pkg1/package-summary.html", + ""}}; private static final String[][] NEGATED_TEST1 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", ""}}; + { "pkg1/C1.html", ""}}; private static final String[][] TEST2 = { - {BUG_ID + FS + "pkg2" + FS + "C2.html", ""}, - {BUG_ID + FS + "pkg2" + FS + "package-summary.html", ""}}; + { "pkg2/C2.html", ""}, + { "pkg2/package-summary.html", ""}}; private static final String[][] NEGATED_TEST2 = { - {BUG_ID + FS + "pkg2" + FS + "C2.html", ""}}; + { "pkg2/C2.html", ""}}; private static final String[][] TEST3 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", ""}, - {BUG_ID + FS + "pkg1" + FS + "package-summary.html", ""}}; + { "pkg1/C1.html", ""}, + { "pkg1/package-summary.html", ""}}; private static final String[][] NEGATED_TEST3 = { - {BUG_ID + FS + "pkg1" + FS + "C1.html", ""}}; + { "pkg1/C1.html", ""}}; private static final String[] ARGS1 = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"}; private static final String[] ARGS2 = new String[] { - "-locale", "ja", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"}; + "-locale", "ja", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg2"}; private static final String[] ARGS3 = new String[] { - "-locale", "en_US", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"}; + "-locale", "en_US", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"}; /** * The entry point of the test. @@ -71,23 +72,9 @@ */ public static void main(String[] args) { TestHtmlTag tester = new TestHtmlTag(); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, TEST2, NEGATED_TEST2); - run(tester, ARGS3, TEST3, NEGATED_TEST3); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS3, TEST3, NEGATED_TEST3); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java --- a/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2014, 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 @@ -32,24 +32,22 @@ public class TestIndentation extends JavadocTester { - //Test information. - private static final String BUG_ID = "8011288"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "p" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "p" }; //Input for string search tests. private static final String[][] TEST = { - { BUG_ID + FS + "p" + FS + "Indent.html", + { "p/Indent.html", "
public <T> void m(T t1," }, - { BUG_ID + FS + "p" + FS + "Indent.html", - NL + " T t2)" }, - { BUG_ID + FS + "p" + FS + "Indent.html", - NL + " throws java.lang.Exception" } + { "p/Indent.html", + "\n" + + " T t2)" }, + { "p/Indent.html", + "\n" + + " throws java.lang.Exception" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -57,21 +55,7 @@ */ public static void main(String[] args) { TestIndentation tester = new TestIndentation(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testIndex/TestIndex.java --- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -36,48 +36,48 @@ public class TestIndex extends JavadocTester { - //Test information. - private static final String BUG_ID = "4852280-4517115-4973608-4994589"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + "/NoPackage.java" }; //Input for string search tests. private static final String[][] TEST = { //Make sure the horizontal scroll bar does not appear in class frame. - {BUG_ID + FS + "index.html", + { "index.html", ""}, //Test index-all.html - {BUG_ID + FS + "index-all.html", + { "index-all.html", "C" + " - Class in pkg"}, - {BUG_ID + FS + "index-all.html", + { "index-all.html", "" + "Interface - Interface in " + "pkg"}, - {BUG_ID + FS + "index-all.html", + { "index-all.html", "" + "AnnotationType - Annotation Type in " + "pkg"}, - {BUG_ID + FS + "index-all.html", + { "index-all.html", "" + "Coin - Enum in " + "pkg"}, - {BUG_ID + FS + "index-all.html", + { "index-all.html", "Class in <Unnamed>"}, - {BUG_ID + FS + "index-all.html", - "
" + NL + "
" + + { "index-all.html", + "
\n" + + "
" + "Java - Static variable in class pkg.C
" + NL + "

" + NL + + "title=\"class in pkg\">C
\n" + + "

\n" + "
JDK " + "- Static variable in class pkg." + - "C
" + NL + "

" + NL + "
"}, + "C\n" + + "

\n" + + ""}, }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -85,21 +85,7 @@ */ public static void main(String[] args) { TestIndex tester = new TestIndex(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java --- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -34,18 +34,18 @@ public class TestInlineLinkLabel extends JavadocTester { - private static final String BUG_ID = "4524136"; private static final String[][] TEST = { //Search for the label to the package link. - {BUG_ID + FS + "pkg" + FS + "C1.html" , "Here is a link to a package"}, + { "pkg/C1.html" , + "Here is a link to a package"}, //Search for the label to the class link - {BUG_ID + FS + "pkg" + FS + "C1.html" , "Here is a link to a class"} + { "pkg/C1.html" , + "Here is a link to a class"} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"}; /** * The entry point of the test. @@ -53,21 +53,7 @@ */ public static void main(String[] args) { TestInlineLinkLabel tester = new TestInlineLinkLabel(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testInterface/TestInterface.java --- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -37,53 +37,64 @@ public class TestInterface extends JavadocTester { - //Test information. - private static final String BUG_ID = "4682448-4947464-5029946"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "Interface.html", + { "pkg/Interface.html", "
int method()
"}, - {BUG_ID + FS + "pkg" + FS + "Interface.html", + { "pkg/Interface.html", "
static final int field
"}, // Make sure known implementing class list is correct and omits type parameters. - {BUG_ID + FS + "pkg" + FS + "Interface.html", - "
" + NL + "
All Known Implementing Classes:
" + NL + + { "pkg/Interface.html", + "
\n" + + "
All Known Implementing Classes:
\n" + "
Child" + ", Parent" + - "
" + NL + "
"}, + "\n" + + "
"}, // Make sure "All Implemented Interfaces": has substituted type parameters - {BUG_ID + FS + "pkg" + FS + "Child.html", - "
" + NL + "
All Implemented Interfaces:
" + NL + + { "pkg/Child.html", + "
\n" + + "
All Implemented Interfaces:
\n" + "
" + - "Interface<T>
" + NL + "
" + "Interface<T>\n" + + "
" }, //Make sure Class Tree has substituted type parameters. - {BUG_ID + FS + "pkg" + FS + "Child.html", - "
" + NL + "
java.lang.Object
" + NL + - "
" + NL + "
" + NL + + { "pkg/Child.html", + "
\n" + + "
java.lang.Object
\n" + + "
\n" + + "
\n" + "
" + - "pkg.Parent<T>
" + NL + "
" + NL + - "
" + NL + "
pkg.Child<T>
" + NL + - "
" + NL + "
" + NL + "
" + NL + "
" + NL + "
" + "pkg.Parent<T>\n" + + "
\n" + + "
\n" + + "
pkg.Child<T>
\n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + + "
" }, //Make sure "Direct Know Subclasses" omits type parameters - {BUG_ID + FS + "pkg" + FS + "Parent.html", - "
" + NL + "
Direct Known Subclasses:
" + NL + + { "pkg/Parent.html", + "
\n" + + "
Direct Known Subclasses:
\n" + "
Child" + - "
" + NL + "
" + "\n" + + "
" }, //Make sure "Specified By" has substituted type parameters. - {BUG_ID + FS + "pkg" + FS + "Child.html", - "
Specified by:
" + NL + + { "pkg/Child.html", + "
Specified by:
\n" + "
method" + " in interface " + "" + @@ -91,8 +102,8 @@ "T>
" }, //Make sure "Overrides" has substituted type parameters. - {BUG_ID + FS + "pkg" + FS + "Child.html", - "
Overrides:
" + NL + + { "pkg/Child.html", + "
Overrides:
\n" + "
method" + " in class Parent<See Also:" + NL + "
getRate(), " + NL + + { "C.html", + "
See Also:
\n" + + "getRate(), \n" + "setRate(double)"}, - {"./" + BUG_ID + "/C.html", - "public final void setRate(double value)" + NL + - "Sets the value of the property rate." + NL + - "" + NL + "Property description:" }, - {"./" + BUG_ID + "/C.html", - "public final double getRate()" + NL + - "Gets the value of the property rate." + NL + - "" + NL + "Property description:" }, - {"./" + BUG_ID + "/C.html", - "
" }, - {"./" + BUG_ID + "/C.html", - "isPaused" + NL + - "public final double isPaused()" + NL + + { "C.html", + "isPaused\n" + + "public final double isPaused()\n" + "Gets the value of the property paused." }, - {"./" + BUG_ID + "/D.html", - "Properties inherited from class C" + NL + + { "D.html", + "Properties inherited from class C\n" + "paused, rate" }, }; private static final String[][] NO_TEST = new String[][] { - {"./" + BUG_ID + "/C.html", + { "C.html", "A()"}, }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "-javafx", - SRC_DIR + FS + "C.java", SRC_DIR + FS + "D.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-javafx", + SRC_DIR + "/C.java", SRC_DIR + "/D.java" }; /** @@ -90,21 +92,7 @@ */ public static void main(String[] args) { TestJavaFX tester = new TestJavaFX(); - run(tester, ARGS, TEST, NO_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java --- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -34,108 +34,90 @@ public class TestJavascript extends JavadocTester { - //Test information. - private static final String BUG_ID = "4665566-4855876-8012375"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "TestJavascript.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + + "/TestJavascript.java" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "C.html", + { "pkg/C.html", "Frames"}, - {BUG_ID + FS + "TestJavascript.html", + { "TestJavascript.html", "Frames"}, - {BUG_ID + FS + "index.html", - ""}, //Make sure title javascript only runs if is-external is not true - {BUG_ID + FS + "pkg" + FS + "C.html", - " try {" + NL + - " if (location.href.indexOf('is-external=true') == -1) {" + NL + - " parent.document.title=\"C\";" + NL + - " }" + NL + - " }" + NL + - " catch(err) {" + NL + + { "pkg/C.html", + " try {\n" + + " if (location.href.indexOf('is-external=true') == -1) {\n" + + " parent.document.title=\"C\";\n" + + " }\n" + + " }\n" + + " catch(err) {\n" + " }"}, }; - private static final String[][] NEGATED_TEST = NO_TEST; - /** * The entry point of the test. * @param args the array of command line arguments. */ public static void main(String[] args) { TestJavascript tester = new TestJavascript(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java --- a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Tue Apr 29 14:40:07 2014 -0700 @@ -40,25 +40,22 @@ public class TestLambdaFeature extends JavadocTester { - //Test information. - private static final String BUG_ID = "8004893-8022738"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "pkg1" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "pkg1" }; private static final String[] ARGS_1 = new String[] { - "-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-source", "1.7", "pkg1" + "-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, "-source", "1.7", "pkg1" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "A.html", + { "pkg/A.html", ""}, - {BUG_ID + FS + "pkg" + FS + "A.html", + { "pkg/A.html", "default void defaultMethod()"}, - {BUG_ID + FS + "pkg" + FS + "A.html", + { "pkg/A.html", ""}, - {BUG_ID + FS + "pkg" + FS + "A.html", - "" + NL + "Functional Interface:" + NL + + { "pkg/A.html", + "\n" + + "Functional Interface:\n" + "This is a functional interface and can therefore be used as " + "the assignment target for a lambda expression or method " + - "reference. " + NL + ""}, - {BUG_ID + FS + "pkg1" + FS + "FuncInf.html", - "" + NL + "Functional Interface:" + NL + + "reference.\n" + + ""}, + { "pkg1/FuncInf.html", + "\n" + + "Functional Interface:\n" + "This is a functional interface and can therefore be used as " + "the assignment target for a lambda expression or method " + - "reference. " + NL + ""} + "reference.\n" + + ""} }; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "pkg" + FS + "A.html", + { "pkg/A.html", ""}, - {BUG_ID + FS + "pkg" + FS + "A.html", + { "pkg/A.html", "default default void defaultMethod()"}, - {BUG_ID + FS + "pkg" + FS + "B.html", + { "pkg/B.html", ""}, - {BUG_ID + FS + "pkg1" + FS + "NotAFuncInf.html", - "" + NL + "Functional Interface:" + NL + + { "pkg1/NotAFuncInf.html", + "\n" + + "Functional Interface:\n" + "This is a functional interface and can therefore be used as " + "the assignment target for a lambda expression or method " + - "reference. " + NL + ""}, - {BUG_ID + FS + "pkg" + FS + "B.html", - "" + NL + "Functional Interface:"} + "reference.\n" + + ""}, + { "pkg/B.html", + "\n" + + "Functional Interface:"} }; private static final String[][] NEGATED_TEST_1 = { - {BUG_ID + "-2" + FS + "pkg1" + FS + "FuncInf.html", - "" + NL + "Functional Interface:"} + { "pkg1/FuncInf.html", + "\n" + + "Functional Interface:"} }; /** @@ -106,22 +111,8 @@ */ public static void main(String[] args) { TestLambdaFeature tester = new TestLambdaFeature(); - run(tester, ARGS, TEST, NEGATED_TEST); - run(tester, ARGS_1, NO_TEST, NEGATED_TEST_1); + tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS_1, NO_TEST, NEGATED_TEST_1); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java --- a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, 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 @@ -37,22 +37,20 @@ public class LeadingSpaces extends JavadocTester { - private static final String BUG_ID = "4232882-8014636"; private static final String[][] TEST = { - {BUG_ID + FS + "LeadingSpaces.html", -" 1" + NL + -" 2" + NL + -" 3" + NL + -" 4" + NL + -" 5" + NL + -" 6" + NL + + { "LeadingSpaces.html", +" 1\n" + +" 2\n" + +" 3\n" + +" 4\n" + +" 5\n" + +" 6\n" + " 7"} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, - SRC_DIR + FS + "LeadingSpaces.java"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, + SRC_DIR + "/LeadingSpaces.java"}; /** * The entry point of the test. @@ -60,25 +58,11 @@ */ public static void main(String[] args) { LeadingSpaces tester = new LeadingSpaces(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } - - /** This leading spaces in the <pre> block below should be preserved. diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java --- a/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -34,49 +34,31 @@ public class TestLegacyTaglet extends JavadocTester { - private static final String BUG_ID = "4638723-8015882"; - private static final String[] ARGS = - new String[] {"-d", BUG_ID, "-sourcepath", SRC_DIR, + new String[] {"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-tagletpath", SRC_DIR, "-taglet", "ToDoTaglet", "-taglet", "Check", - "-taglet", "UnderlineTaglet", SRC_DIR + FS + "C.java"}; + "-taglet", "UnderlineTaglet", SRC_DIR + "/C.java"}; private static final String[][] TEST = new String[][] { - {BUG_ID + FS + "C.html", "This is an underline"}, - {BUG_ID + FS + "C.html", + { "C.html", "This is an underline"}, + { "C.html", "To Do:
Class Summary" + " Interface Summary" + " Enum Summary" + " Annotation Types Summary" + " Fields All " + "Methods " + "" + @@ -211,94 +208,94 @@ "Deprecated Methods " + "Nested Classes Constructors Enum Constants Required Elements " + "Optional Elements " + "Packages that use I1" + " Fields in " + "pkg2 declared as C1 " + "Methods in " + "pkg2 that return C1" + " Fields in " + "pkg1 declared as C2" + " Methods in " + "pkg1 that return C2" + " Methods in " + "pkg2 that return C2.ModalExclusionType" + " Packages that use " + "pkg1 Classes in " + "pkg1 used by pkg1" + " Packages that use " + "pkg2 Classes in " + "pkg2 used by pkg1" + " Deprecated Fields" + " Deprecated Methods" + " pkg1." + "C1 Packages
" + - "Class \n" + + " Description " + - "Interface \n" + + " Description " + - "Enum \n" + + " Description " + - "Annotation Type \n" + + " Description Modifier and Type Modifier and Type Field and Description Modifier and Type Modifier and Type Method and Description Modifier and Type Modifier and Type Class and Description Constructor and Description Enum Constant and Description Modifier and Type Modifier and Type Required Element and Description Modifier and Type Modifier and Type Optional Element and Description Package Package Description Modifier and Type Modifier and Type Field and Description Modifier and Type Modifier and Type Method and Description Modifier and Type Modifier and Type Field and Description Modifier and Type Modifier and Type Method and Description Package Package Description Modifier and Type Modifier and Type Method and Description Package Package Description Class and Description Package Package Description Class and Description Field and Description Method and Description " + - "Modifier and Type Value " + - "Package \n" + + " Description rate" + NL + + { "C.html", + "
public final void setRate(double value)
\n" + + "
Sets the value of the property rate.
\n" + + "
\n" + + "
Property description:
" }, + { "C.html", + "
public final double getRate()
\n" + + "
Gets the value of the property rate.
\n" + + "
\n" + + "
Property description:
" }, + { "C.html", + "
rate\n" + "
Defines the direction/speed at which the Timeline is expected to"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "Default value:"}, - {"./" + BUG_ID + "/C.html", - "Since:" + NL + "
JavaFX 8.0
" }, - {"./" + BUG_ID + "/C.html", + { "C.html", + "Since:\n" + + "
JavaFX 8.0
" }, + { "C.html", "
Sets the value of the property Property"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "
Gets the value of the property Property"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "Property description:"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "
setTestMethodProperty() default void
" + "All Methods " + "" + @@ -69,35 +66,43 @@ "" + "Default Methods" + "
default default void default void
" + "
Finish this class.
"}, - {BUG_ID + FS + "C.html", - "To Do: " + + { "C.html", + "To Do: " + "Tag in Method."} }; - private static final String[][] NEGATED_TEST = NO_TEST; - /** * The entry point of the test. * @param args the array of command line arguments. */ public static void main(String[] args) { TestLegacyTaglet tester = new TestLegacyTaglet(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); if (tester.getErrorOutput().contains("NullPointerException")) { throw new AssertionError("javadoc threw NullPointerException"); } tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java --- a/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -34,11 +34,9 @@ public class TestBadLinkOption extends JavadocTester { - private static final String BUG_ID = "4720957"; - private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, - "-link", BUG_ID, "pkg" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, + "-link", OUTPUT_DIR, "pkg" }; private static final String[][] TEST = { @@ -55,21 +53,7 @@ */ public static void main(String[] args) { TestBadLinkOption tester = new TestBadLinkOption(); - run(tester, ARGS, TEST, NEG_TEST); + tester.run(ARGS, TEST, NEG_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java --- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -23,47 +23,47 @@ /* * @test - * @bug 4720957 5020118 8026567 + * @bug 4720957 5020118 8026567 8038976 * @summary Test to make sure that -link and -linkoffline link to - * right files. + * right files, and URLs with and without trailing slash are accepted. * @author jamieh * @library ../lib/ * @build JavadocTester TestLinkOption * @run main TestLinkOption */ -public class TestLinkOption extends JavadocTester { +import java.io.File; - private static final String BUG_ID = "4720957-5020118"; +public class TestLinkOption extends JavadocTester { //Generate the documentation using -linkoffline and a URL as the first parameter. private static final String[] ARGS1 = new String[] { - "-d", BUG_ID + "-1", "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR, "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/", SRC_DIR, "-package", "pkg", "java.lang" }; private static final String[][] TEST1 = { - {BUG_ID + "-1" + FS + "pkg" + FS + "C.html", + { "pkg/C.html", "Link to String Class" }, //Make sure the parameters are indented properly when the -link option is used. - {BUG_ID + "-1" + FS + "pkg" + FS + "C.html", - "(int p1," + NL + - " int p2," + NL + - " int p3)" + { "pkg/C.html", + "(int p1,\n" + + " int p2,\n" + + " int p3)" }, - {BUG_ID + "-1" + FS + "pkg" + FS + "C.html", - "(int p1," + NL + - " int p2," + NL + - " " + - "Object p3)" + { "pkg/C.html", + "(int p1,\n" + + " int p2,\n" + + " " + + "Object p3)" }, - {BUG_ID + "-1" + FS + "java" + FS + "lang" + FS + "StringBuilderChild.html", - "public abstract class StringBuilderChild" + NL + + { "java/lang/StringBuilderChild.html", + "public abstract class StringBuilderChild\n" + "extends Object" + "title=\"class or interface in java.lang\">Object" }, }; @@ -72,40 +72,61 @@ //Generate the documentation using -linkoffline and a relative path as the first parameter. //We will try linking to the docs generated in test 1 with a relative path. private static final String[] ARGS2 = new String[] { - "-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, - "-linkoffline", "../" + BUG_ID + "-1", BUG_ID + "-1", "-package", "pkg2" + "-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, + "-linkoffline", "../" + OUTPUT_DIR + "-1", + OUTPUT_DIR + "-1", "-package", "pkg2" }; private static final String[][] TEST2 = { - {BUG_ID + "-2" + FS + "pkg2" + FS + "C2.html", - "This is a link to Class C." } }; - private static final String[][] NEGATED_TEST2 = NO_TEST; - + /* + * Create the documentation using the -link option, vary the behavior with + * both trailing and no trailing slash. We are only interested in ensuring + * that the command executes with no errors or related warnings. + */ + static String[] createArguments(boolean withTrailingSlash) { + String packagePath = new File(OUTPUT_DIR + "-1").getAbsolutePath(); + String outputDirName = OUTPUT_DIR; + if (withTrailingSlash) { + // add the trailing slash, if it is not present! + if (!packagePath.endsWith(FS)) { + packagePath = packagePath + FS; + } + outputDirName = outputDirName + "-3"; + } else { + // remove the trailing slash, if it is present! + if (packagePath.endsWith(FS)) { + packagePath = packagePath.substring(0, packagePath.length() - 1); + } + outputDirName = outputDirName + "-4"; + } + String args[] = { + "-d", outputDirName, "-sourcepath", SRC_DIR, + "-link", "file:///" + packagePath, "-package", "pkg2" + }; + System.out.println("packagePath: " + packagePath); + return args; + } /** * The entry point of the test. * @param args the array of command line arguments. */ public static void main(String[] args) { TestLinkOption tester = new TestLinkOption(); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS2, TEST2, NO_TEST); + tester.runJavadoc(createArguments(true)); // with trailing slash + tester.runJavadoc(createArguments(false)); // without trailing slash + tester.printSummary(); + if (tester.getWarningOutput().contains("warning - Error fetching URL")) { + throw new Error("URL rejected ?"); + } tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java --- a/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,7 +35,6 @@ public class TestNewLineInLink extends JavadocTester { - private static final String BUG_ID = "4739870"; private static final String[][] NEGATED_TEST = new String[][] { {ERROR_OUTPUT, @@ -43,7 +42,7 @@ }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-linkoffline", "http://www.java.sun.com/j2se/1.4/docs/api", SRC_DIR, "testNewLineInLink"}; @@ -53,21 +52,7 @@ */ public static void main(String[] args) { TestNewLineInLink tester = new TestNewLineInLink(); - run(tester, ARGS, new String[][] {}, NEGATED_TEST); + tester.run(ARGS, new String[][] {}, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java --- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, 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 @@ -35,32 +35,31 @@ public class TestLinkTaglet extends JavadocTester { - //Test information. - private static final String BUG_ID = "4732864-6280605-7064544-8014636"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "checkPkg" + FS + "B.java" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + + "/checkPkg/B.java" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "C.html", - "Qualified Link: C.InnerC. " + NL + - " Unqualified Link1: C.InnerC. " + NL + - " Unqualified Link2: C.InnerC. " + NL + - " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2). " + NL + - " Unqualified Link: method(C.InnerC, C.InnerC2). " + NL + + { "pkg/C.html", + "Qualified Link: C.InnerC. \n" + + " Unqualified Link1: C.InnerC. \n" + + " Unqualified Link2: C.InnerC. \n" + + " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2). \n" + + " Unqualified Link: method(C.InnerC, C.InnerC2). \n" + " Unqualified Link: method(InnerC, InnerC2). " }, - {BUG_ID + FS + "pkg" + FS + "C.InnerC.html", - "Link to member in outer class: C.MEMBER " + NL + - " Link to member in inner class: C.InnerC2.MEMBER2 " + NL + + { "pkg/C.InnerC.html", + "Link to member in outer class: C.MEMBER \n" + + " Link to member in inner class: C.InnerC2.MEMBER2 \n" + " Link to another inner class: C.InnerC2" }, - {BUG_ID + FS + "pkg" + FS + "C.InnerC2.html", - "" + NL + "Enclosing class:" + NL + - "C" + NL + + { "pkg/C.InnerC2.html", + "\n" + + "Enclosing class:\n" + + "C\n" + "" }, }; @@ -74,21 +73,7 @@ */ public static void main(String[] args) { TestLinkTaglet tester = new TestLinkTaglet(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java --- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -35,15 +35,13 @@ public class TestLinkToSerialForm extends JavadocTester { - private static final String BUG_ID = "4521661"; private static final String[][] TEST = { - {BUG_ID + FS + "serialized-form.html", ""}, - {BUG_ID + FS + "pkg" + FS + "C.html", ""} + { "serialized-form.html", ""}, + { "pkg/C.html", ""} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"}; /** * The entry point of the test. @@ -51,21 +49,7 @@ */ public static void main(String[] args) { TestLinkToSerialForm tester = new TestLinkToSerialForm(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java --- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2014, 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 @@ -32,10 +32,6 @@ public class TestLiteralCodeInPre extends JavadocTester { - //Test information. - private static final String BUG_ID = "8002387-8014636"; - private static final String OUTPUT_DIR = BUG_ID; - //Javadoc arguments. private static final String[] ARGS = new String[] { "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-Xdoclint:none", "pkg" @@ -43,75 +39,59 @@ //Input for string search tests. private static final String[][] TEST = { - { BUG_ID + FS + "pkg" + FS + "Test.html", - "no_pre()

Lorem ipsum dolor sit amet, consectetur adipiscing elit." + NL +
-            " Example:  " + NL +
-            "   line 1 <T> void m(T t) {" + NL +
-            "   line 2     // do something with T" + NL +
-            "   line 3 }" + NL +
-            " " + NL +
+        { "pkg/Test.html",
+            "typical_usage_code()\n" +
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
+            " Example:  \n" +
+            "   line 1 <T> void m(T t) {\n" +
+            "   line 2     // do something with T\n" +
+            "   line 3 }\n" +
+            " \n" +
             " and so it goes." },
-        { BUG_ID + FS + "pkg" + FS + "Test.html",
-            "typical_usage_literal()" + NL +
-            "

Lorem ipsum dolor sit amet, consectetur adipiscing elit." + NL +
-            " Example:  " + NL +
-            "   line 1 <T> void m(T t) {" + NL +
-            "   line 2     // do something with T" + NL +
-            "   line 3 }" + NL +
-            " " + NL +
+        { "pkg/Test.html",
+            "typical_usage_literal()\n" +
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
+            " Example:  \n" +
+            "   line 1 <T> void m(T t) {\n" +
+            "   line 2     // do something with T\n" +
+            "   line 3 }\n" +
+            " \n" +
             " and so it goes." },
-        { BUG_ID + FS + "pkg" + FS + "Test.html",
-            "recommended_usage_literal()" + NL +
-            "

Lorem ipsum dolor sit amet, consectetur adipiscing elit." + NL +
-            " Example:  " + NL +
-            "   line 1 <T> void m(T t) {" + NL +
-            "   line 2     // do something with T" + NL +
-            "   line 3 } " + NL +
+        { "pkg/Test.html",
+            "recommended_usage_literal()\n" +
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
+            " Example:  \n" +
+            "   line 1 <T> void m(T t) {\n" +
+            "   line 2     // do something with T\n" +
+            "   line 3 } \n" +
             " and so it goes." }
     };
 
-    private static final String[][] NEGATED_TEST = NO_TEST;
-
     /**
      * The entry point of the test.
      * @param args the array of command line arguments.
      */
     public static void main(String[] args) {
         TestLiteralCodeInPre tester = new TestLiteralCodeInPre();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,66 +35,67 @@
 
 public class TestMemberInheritence extends JavadocTester {
 
-    private static final String BUG_ID = "4638588-4635809-6256068-6270645";
-
     private static final String[][] TEST = {
         //Public field should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          ""},
 
         //Public method should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          ""},
 
         //Public inner class should be inherited.
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          ""},
 
         //Protected field should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          ""},
 
         //Protected method should be inherited
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          ""},
 
         //Protected inner class should be inherited.
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          ""},
 
         // New labels as of 1.5.0
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          "Nested classes/interfaces inherited from class pkg." +
                  "BaseClass"},
-        {BUG_ID + FS + "pkg" + FS + "SubClass.html",
+        { "pkg/SubClass.html",
          "Nested classes/interfaces inherited from interface pkg." +
                  "BaseInterface"},
 
          // Test overriding/implementing methods with generic parameters.
-                 {BUG_ID + FS + "pkg" + FS + "BaseClass.html",
-         "

Specified by:

"}, // Test diamond inheritence member summary (6256068) - {BUG_ID + FS + "diamond" + FS + "Z.html", + { "diamond/Z.html", "aMethod"}, // Test that doc is inherited from closed parent (6270645) - {BUG_ID + FS + "inheritDist" + FS + "C.html", + { "inheritDist/C.html", "

m1-B

"}, }; private static final String[][] NEGATED_TEST = { - {BUG_ID + FS + "pkg" + FS + "SubClass.html", + { "pkg/SubClass.html", "staticMethod"}, }; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "diamond", "inheritDist"}; + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "diamond", + "inheritDist"}; /** * The entry point of the test. @@ -102,21 +103,7 @@ */ public static void main(String[] args) { TestMemberInheritence tester = new TestMemberInheritence(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java --- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -36,38 +36,34 @@ public class TestMemberSummary extends JavadocTester { - //Test information. - private static final String BUG_ID = "4951228-6290760"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg","pkg2" + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg","pkg2" }; //Input for string search tests. private static final String[][] TEST = { // Check return type in member summary. - {BUG_ID + FS + "pkg" + FS + "PublicChild.html", - "PublicChild" + NL + + { "pkg/PublicChild.html", + "PublicChild\n" + "

" +
             "returnTypeTest()

" }, // Check return type in member detail. - {BUG_ID + FS + "pkg" + FS + "PublicChild.html", + { "pkg/PublicChild.html", "

public " +
             "PublicChild returnTypeTest()

Prev Class

"}, - {BUG_ID + FS + "pkg" + FS + "A.html", + { "pkg/A.html", "

Prev Class

"}, + { "pkg/A.html", "Next Class"}, - {BUG_ID + FS + "pkg" + FS + "C.html", + { "pkg/C.html", "Prev Class"}, - {BUG_ID + FS + "pkg" + FS + "C.html", + { "pkg/C.html", "Next Class"}, - {BUG_ID + FS + "pkg" + FS + "E.html", + { "pkg/E.html", "Prev Class"}, - {BUG_ID + FS + "pkg" + FS + "E.html", + { "pkg/E.html", "Next Class"}, - {BUG_ID + FS + "pkg" + FS + "I.html", + { "pkg/I.html", "Prev Class"}, - {BUG_ID + FS + "pkg" + FS + "I.html", "

Next Class

"}, + { "pkg/I.html", "

Next Class

"}, // Test for 4664607 - {BUG_ID + FS + "pkg" + FS + "I.html", - "

Skip navigation links

" + NL + "" + NL + - "" + NL + ""} + { "pkg/I.html", + "

Skip navigation links

\n" + + "\n" + + "\n" + + ""} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -71,21 +69,7 @@ */ public static void main(String[] args) { TestNavigation tester = new TestNavigation(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java --- a/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2014, 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 @@ -33,24 +33,20 @@ public class TestNestedGenerics extends JavadocTester { - //Test information. - private static final String BUG_ID = "6758050"; - //Javadoc arguments. private static final String[] ARGS = new String[]{ - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg" }; //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "NestedGenerics.html", + { "pkg/NestedGenerics.html", "

Contains

foo" +
             "(java.util.Map<A, java.util.Map<A, A>>)

" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -58,21 +54,7 @@ */ public static void main(String[] args) { TestNestedGenerics tester = new TestNestedGenerics(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java --- a/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, 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 @@ -54,37 +54,35 @@ */ public void method(){} - private static final String BUG_ID = "no-bug-id"; private static final String[][] TEST = { //Test nested inline tag in class description. - {BUG_ID + FS + "TestNestedInlineTag.html", + { "TestNestedInlineTag.html", "This should be green, underlined and bold (Class): My test" }, //Test nested inline tag in field description. - {BUG_ID + FS + "TestNestedInlineTag.html", + { "TestNestedInlineTag.html", "This should be green, underlined and bold (Field): My test" }, //Test nested inline tag in constructor description. - {BUG_ID + FS + "TestNestedInlineTag.html", + { "TestNestedInlineTag.html", "This should be green, underlined and bold (Constructor): My test" }, //Test nested inline tag in method description. - {BUG_ID + FS + "TestNestedInlineTag.html", + { "TestNestedInlineTag.html", "This should be green, underlined and bold (Method): My test" } }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { - "-d", BUG_ID, "-sourcepath", SRC_DIR, + "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-taglet", "testtaglets.UnderlineTaglet", "-taglet", "testtaglets.BoldTaglet", "-taglet", "testtaglets.GreenTaglet", - SRC_DIR + FS + "TestNestedInlineTag.java" + SRC_DIR + "/TestNestedInlineTag.java" }; /** @@ -93,21 +91,7 @@ */ public static void main(String[] args) { TestNestedInlineTag tester = new TestNestedInlineTag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java --- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Apr 29 15:44:14 2014 -0400 +++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Tue Apr 29 14:40:07 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, 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 @@ -35,12 +35,10 @@ public class TestNewLanguageFeatures extends JavadocTester { - //Test information. - private static final String BUG_ID = "4789689-4905985-4927164-4827184-4993906"; - //Javadoc arguments. private static final String[] ARGS = new String[] { - "-Xdoclint:none", "-d", BUG_ID, "-use", "-sourcepath", SRC_DIR, "pkg", "pkg1", "pkg2" + "-Xdoclint:none", "-d", OUTPUT_DIR, "-use", "-sourcepath", SRC_DIR, + "pkg", "pkg1", "pkg2" }; //Input for string search tests. @@ -50,64 +48,72 @@ // ENUM TESTING //================================= //Make sure enum header is correct. - {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin"}, + { "pkg/Coin.html", "Enum Coin"}, //Make sure enum signature is correct. - {BUG_ID + FS + "pkg" + FS + "Coin.html", "

public enum " +
-                     "Coin" + NL +
+            { "pkg/Coin.html", "public enum " +
+                     "Coin\n" +
                      "extends java.lang.Enum<Coin>"
             },
             //Check for enum constant section
-            {BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Constants" +
+            { "pkg/Coin.html", "Enum Constants" +
                      " "},
             //Detail for enum constant
-            {BUG_ID + FS + "pkg" + FS + "Coin.html",
+            { "pkg/Coin.html",
                 "Dime"},
             //Automatically insert documentation for values() and valueOf().
-            {BUG_ID + FS + "pkg" + FS + "Coin.html",
+            { "pkg/Coin.html",
                 "Returns an array containing the constants of this enum type,"},
-            {BUG_ID + FS + "pkg" + FS + "Coin.html",
+            { "pkg/Coin.html",
                 "Returns the enum constant of this type with the specified name"},
-            {BUG_ID + FS + "pkg" + FS + "Coin.html", "for (Coin c : Coin.values())"},
-            {BUG_ID + FS + "pkg" + FS + "Coin.html", "Overloaded valueOf() method has correct documentation."},
-            {BUG_ID + FS + "pkg" + FS + "Coin.html", "Overloaded values method  has correct documentation."},
+            { "pkg/Coin.html", "for (Coin c : Coin.values())"},
+            { "pkg/Coin.html",
+                "Overloaded valueOf() method has correct documentation."},
+            { "pkg/Coin.html",
+                "Overloaded values method  has correct documentation."},
 
             //=================================
             // TYPE PARAMETER TESTING
             //=================================
             //Make sure the header is correct.
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
+            { "pkg/TypeParameters.html",
                 "Class TypeParameters<E>"},
             //Check class type parameters section.
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
-                "Type Parameters:
" + NL + "E - " +
+            { "pkg/TypeParameters.html",
+                "
Type Parameters:\n" +
+                "E - " +
                 "the type parameter for this class."},
             //Type parameters in @see/@link
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
-                "" + NL + "See Also:
" + NL + "" +
+            { "pkg/TypeParameters.html",
+                "\n" +
+                "See Also:\n" +
+                "" +
                 "" +
-                "TypeParameters
" + NL + ""},
+                "TypeParameters\n" +
+                ""},
             //Method that uses class type parameter.
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
+            { "pkg/TypeParameters.html",
                 "(E param)"},
             //Method type parameter section.
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
-                "Type Parameters:" + NL + "
T - This is the first " +
-                    "type parameter.
" + NL + "V - This is the second type " +
+            { "pkg/TypeParameters.html",
+                "Type Parameters:\n" +
+                "
T - This is the first " +
+                    "type parameter.\n" +
+                    "V - This is the second type " +
                     "parameter."},
             //Signature of method with type parameters
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
+            { "pkg/TypeParameters.html",
                 "public <T extends java.util.List,V> " +
                 "java.lang.String[] methodThatHasTypeParameters"},
             //Wildcard testing.
-            {BUG_ID + FS + "pkg" + FS + "Wildcards.html",
+            { "pkg/Wildcards.html",
                 "" +
                 "TypeParameters<? super java.lang.String> a"},
-            {BUG_ID + FS + "pkg" + FS + "Wildcards.html",
+            { "pkg/Wildcards.html",
                 "" +
                 "TypeParameters<? extends java.lang.StringBuffer> b"},
-            {BUG_ID + FS + "pkg" + FS + "Wildcards.html",
+            { "pkg/Wildcards.html",
                 "" +
                     "TypeParameters c"},
             //Bad type parameter warnings.
@@ -117,36 +123,42 @@
                 "\"\" is not a type parameter name."},
 
             //Signature of subclass that has type parameters.
-            {BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
+            { "pkg/TypeParameterSubClass.html",
                 "public class TypeParameterSubClass<T extends " +
-                "java.lang.String>" + NL + "extends " +
+                "java.lang.String>\n" +
+                "extends " +
                 "" +
                 "TypeParameterSuperClass<T>"},
 
             //Interface generic parameter substitution
             //Signature of subclass that has type parameters.
-            {BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
-                "" + NL + "All Implemented Interfaces:" + NL +
+            { "pkg/TypeParameters.html",
+                "\n" +
+                "All Implemented Interfaces:\n" +
                 "" +
                 "SubInterface<E>, SuperInterface<E>" + NL +
+                "title=\"interface in pkg\">SuperInterface<E>\n" +
                 ""},
-            {BUG_ID + FS + "pkg" + FS + "SuperInterface.html",
-                "" + NL + "All Known Subinterfaces:" + NL +
+            { "pkg/SuperInterface.html",
+                "\n" +
+                "All Known Subinterfaces:\n" +
                 "" +
-                "SubInterface<V>
" + NL + ""},
-            {BUG_ID + FS + "pkg" + FS + "SubInterface.html",
-                "" + NL + "All Superinterfaces:" + NL +
+                "SubInterface<V>\n" +
+                ""},
+            { "pkg/SubInterface.html",
+                "\n" +
+                "All Superinterfaces:\n" +
                 "" +
-                "SuperInterface<V>
" + NL + ""},
+                "SuperInterface<V>\n" +
+                ""},
 
             //=================================
             // VAR ARG TESTING
             //=================================
-            {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int... i)"},
-            {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[][]... i)"},
-            {BUG_ID + FS + "pkg" + FS + "VarArgs.html", "-int:A...-"},
-            {BUG_ID + FS + "pkg" + FS + "VarArgs.html",
+            { "pkg/VarArgs.html", "(int... i)"},
+            { "pkg/VarArgs.html", "(int[][]... i)"},
+            { "pkg/VarArgs.html", "-int:A...-"},
+            { "pkg/VarArgs.html",
                 "" +
                 "TypeParameters... t"},
 
@@ -154,32 +166,37 @@
             // ANNOTATION TYPE TESTING
             //=================================
             //Make sure the summary links are correct.
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
-                "Summary: 
" + NL + "Field | " + NL +
+            { "pkg/AnnotationType.html",
+                "Summary: \n" +
+                "Field | \n" +
                 "" +
-                "Required | 
" + NL + "" +
+                "Required | \n" +
+                "" +
                 "Optional"},
             //Make sure the detail links are correct.
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
-                "Detail: 
" + NL + "Field | " + NL +
+            { "pkg/AnnotationType.html",
+                "Detail: \n" +
+                "Field | \n" +
                 "Element"},
             //Make sure the heading is correct.
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
+            { "pkg/AnnotationType.html",
                 "Annotation Type AnnotationType"},
             //Make sure the signature is correct.
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
+            { "pkg/AnnotationType.html",
                 "public @interface AnnotationType"},
             //Make sure member summary headings are correct.
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
+            { "pkg/AnnotationType.html",
                 "Required Element Summary"},
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
+            { "pkg/AnnotationType.html",
                 "Optional Element Summary"},
             //Make sure element detail heading is correct
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
+            { "pkg/AnnotationType.html",
                 "Element Detail"},
             //Make sure default annotation type value is printed when necessary.
-            {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
-                "" + NL + "Default:
" + NL + "\"unknown\"" + NL +
+            { "pkg/AnnotationType.html",
+                "\n" +
+                "Default:\n" +
+                "\"unknown\"\n" +
                 ""},
 
             //=================================
@@ -187,65 +204,70 @@
             //=================================
 
             //PACKAGE
-            {BUG_ID + FS + "pkg" + FS + "package-summary.html",
-                "@AnnotationType(optional=\"Package Annotation\"," + NL +
+            { "pkg/package-summary.html",
+                "@AnnotationType(optional=\"Package Annotation\",\n" +
                 "                required=1994)"},
 
             //CLASS
-            {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
+            { "pkg/AnnotationTypeUsage.html",
                 "@AnnotationType(" +
                 "optional" +
-                "=\"Class Annotation\"," + NL +
+                "=\"Class Annotation\",\n" +
                 "                " +
-                "required=1994)" + NL + "public class " +
-                "AnnotationTypeUsage" + NL + "extends java.lang.Object"},
+                "required=1994)\n" +
+                "public class " +
+                "AnnotationTypeUsage\n" +
+                "extends java.lang.Object

"}, //FIELD - {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", + { "pkg/AnnotationTypeUsage.html", "

@AnnotationType(" +
                 "optional" +
-                "=\"Field Annotation\"," + NL +
+                "=\"Field Annotation\",\n" +
                 "                " +
-                "required=1994)" + NL + "public int field

"}, + "required=1994)\n" + + "public int field"}, //CONSTRUCTOR - {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", + { "pkg/AnnotationTypeUsage.html", "

@AnnotationType(" +
                 "optional" +
-                "=\"Constructor Annotation\"," + NL +
+                "=\"Constructor Annotation\",\n" +
                 "                " +
-                "required=1994)" + NL + "public AnnotationTypeUsage()

"}, + "required=1994)\n" + + "public AnnotationTypeUsage()"}, //METHOD - {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", + { "pkg/AnnotationTypeUsage.html", "

@AnnotationType(" +
                 "optional" +
-                "=\"Method Annotation\"," + NL +
+                "=\"Method Annotation\",\n" +
                 "                " +
-                "required=1994)" + NL + "public void method()

"}, + "required=1994)\n" + + "public void method()"}, //METHOD PARAMS - {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", + { "pkg/AnnotationTypeUsage.html", "

public void methodWithParams(" +
                 "" +
                 "@AnnotationType(" +
                 "optional=\"Parameter Annotation\",required=1994)" + NL +
-                "                             int documented," + NL +
+                "href=\"../pkg/AnnotationType.html#required--\">required=1994)\n" +
+                "                             int documented,\n" +
                 "                             int undocmented)

"}, //CONSTRUCTOR PARAMS - {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html", + { "pkg/AnnotationTypeUsage.html", "

public AnnotationTypeUsage(" +
                 "@AnnotationType(" +
                 "optional=\"Constructor Param Annotation\",required=1994)" + NL +
-                "                           int documented," + NL +
+                "href=\"../pkg/AnnotationType.html#required--\">required=1994)\n" +
+                "                           int documented,\n" +
                 "                           int undocmented)

"}, //================================= @@ -253,59 +275,59 @@ //================================= //Integer - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "d=3.14,"}, //Double - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "d=3.14,"}, //Boolean - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "b=true,"}, //String - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "s=\"sigh\","}, //Class - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "c=Foo.class,"}, //Bounded Class - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "w=TypeParameterSubClass.class,"}, //Enum - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "e=Penny,"}, //Annotation Type - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "a=@AnnotationType(optional=\"foo\",required=1994),"}, //String Array - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "sa={\"up\",\"down\"},"}, //Primitive - {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "primitiveClassTest=boolean.class,"}, //XXX: Add array test case after this if fixed: //5020899: Incorrect internal representation of class-valued annotation elements //Make sure that annotations are surrounded by

and

- {BUG_ID + FS + "pkg1" + FS + "B.html", + { "pkg1/B.html", "

@A"},
-            {BUG_ID + FS + "pkg1" + FS + "B.html",
+            { "pkg1/B.html",
                 "public interface B

"}, //============================================================== // Handle multiple bounds. //============================================================== - {BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html", + { "pkg/MultiTypeParameters.html", "public <T extends java.lang.Number & java.lang.Runnable> T foo(T t)"}, //============================================================== @@ -313,79 +335,79 @@ //============================================================== //ClassUseTest1: - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", + { "pkg2/class-use/Foo.html", "Classes in pkg2 with type parameters of " + "type " + "Foo " }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", + { "pkg2/class-use/Foo.html", "

ClassUseTest1<T extends " +
                      "Foo" +
                      " & " +
                      "Foo2>

" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", + { "pkg2/class-use/Foo.html", "Methods in pkg2 with type parameters of " + "type Foo " }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", + { "pkg2/class-use/Foo.html", "ClassUseTest1." + "

method" +
                      "(T t)

" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", + { "pkg2/class-use/Foo.html", "Fields in pkg2 with type parameters of " + "type " + "Foo " }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html", + { "pkg2/class-use/Foo.html", "td class=\"colFirst\">

ParamTest" +
                      "<Foo>

" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", + { "pkg2/class-use/ParamTest.html", "Fields in pkg2 declared as ParamTest" + " " }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html", + { "pkg2/class-use/ParamTest.html", "ParamTest<Foo>" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", + { "pkg2/class-use/Foo2.html", "Classes in pkg2 with type parameters of " + "type Foo2 " + "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", + { "pkg2/class-use/Foo2.html", "

ClassUseTest1<T extends " +
                      "Foo" +
                      " & " +
                      "Foo2>

" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", + { "pkg2/class-use/Foo2.html", "Methods in pkg2 with type parameters of " + "type Foo2 " + "" }, - {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html", + { "pkg2/class-use/Foo2.html", "" + "ClassUseTest1.

method" +
@@ -393,53 +415,53 @@
             },
 
             //ClassUseTest2: >
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "Classes in pkg2 with type parameters of " +
                      "type ParamTest" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "ClassUseTest2<T extends " +
                      "" +
                      "ParamTest<" +
                      "Foo3>> "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "Methods in pkg2 with type parameters of " +
                      "type ParamTest" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "ClassUseTest2." +
                      "method" +
                      "(T t) "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "Fields in pkg2 declared as ParamTest" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "ParamTest" +
                      "<" +
                      "Foo>"
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "Methods in pkg2 with type parameters of " +
                      "type ParamTest" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
+            { "pkg2/class-use/ParamTest.html",
                      "<T extends ParamTest" +
                      "<Foo3>"
             },
 
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
+            { "pkg2/class-use/Foo3.html",
                      "Classes in pkg2 with type parameters of " +
                      "type " +
                      "Foo3 "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
+            { "pkg2/class-use/Foo3.html",
                      "ClassUseTest2<T extends " +
                      "" +
                      "ParamTest<" +
                      "Foo3>> "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
+            { "pkg2/class-use/Foo3.html",
                      "Methods in pkg2 with type parameters of " +
                      "type Foo3 " +
                      ""
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
+            { "pkg2/class-use/Foo3.html",
                      "ClassUseTest2." +
                      "method" +
                      "(T t) "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
+            { "pkg2/class-use/Foo3.html",
                      "Methods in pkg2 that return types with " +
                      "arguments of type Foo3" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
+            { "pkg2/class-use/Foo3.html",
                      "<T extends ParamTest<" +
                      "Foo3" +
@@ -492,14 +514,14 @@
             },
 
             //ClassUseTest3: >>
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
+            { "pkg2/class-use/ParamTest2.html",
                      "Classes in pkg2 with type parameters of " +
                      "type ParamTest2

" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
+            { "pkg2/class-use/ParamTest2.html",
                      "ClassUseTest3<T extends " +
                      "" +
@@ -507,19 +529,19 @@
                      "" +
                      "Foo4>>> "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
+            { "pkg2/class-use/ParamTest2.html",
                      "Methods in pkg2 with type parameters of " +
                      "type ParamTest2" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
+            { "pkg2/class-use/ParamTest2.html",
                      "ClassUseTest3" +
                      ".method(T t) "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
+            { "pkg2/class-use/ParamTest2.html",
                      "<T extends " +
                      "ParamTest2<java.util.List<? extends Foo4>>"
             },
 
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "Classes in pkg2 with type parameters of " +
                      "type Foo4 " +
                      ""
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "ClassUseTest3<T extends " +
                      "" +
@@ -545,26 +567,26 @@
                      "" +
                      "Foo4>>> "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "Methods in pkg2 with type parameters of " +
                      "type Foo4 "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "ClassUseTest3." +
                      "method(T t)" +
                      " "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "Methods in pkg2 that return types with " +
                      "arguments of type Foo4 "
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "<T extends " +
                      "ParamTest2<java.util.List<? extends Method parameters in pkg2 with type arguments of " +
                      "type Foo4 " +
-                     "" + NL + "" + NL +
-                     "Modifier and Type" + NL +
-                     "Method and Description" + NL +
-                     "" + NL + "" + NL + "" + NL +
-                     "void" + NL +
+                     "\n" +
+                     "\n" +
+                     "Modifier and Type\n" +
+                     "Method and Description\n" +
+                     "\n" +
+                     "\n" +
+                     "\n" +
+                     "void\n" +
                      "ClassUseTest3." +
                      "method(java." +
                      "util.Set<Foo4> p) " + NL +
-                     "" + NL + ""
+                     "class in pkg2\">Foo4> p) \n" +
+                     "\n" +
+                     ""
             },
-            {BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
+            { "pkg2/class-use/Foo4.html",
                      "Constructor parameters in pkg2 with type arguments " +
                      "of type Packages with annotations of type " +
                      "AnnotationType " +
                      ""
             },
 
-            {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+            { "pkg/class-use/AnnotationType.html",
                      "Classes in pkg with annotations of type " +
                      " "
             },
 
-            {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+            { "pkg/class-use/AnnotationType.html",
                      "Fields in pkg with annotations of type " +
                      ""
             },
 
-            {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+            { "pkg/class-use/AnnotationType.html",
                      "Methods in pkg with annotations of type " +
                      ""
             },
 
-            {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+            { "pkg/class-use/AnnotationType.html",
                      "Method parameters in pkg with annotations of type " +
                      ""
             },
 
-            {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+            { "pkg/class-use/AnnotationType.html",
                      "Constructors in pkg with annotations of type " +
                      ""
             },
 
-            {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+            { "pkg/class-use/AnnotationType.html",
                      "Constructor parameters in pkg with annotations of " +
                      "type " +
                 "method(Vector<Object>)"
             },
             //=================================
             // TYPE PARAMETER IN INDEX
             //=================================
-            {BUG_ID + FS + "index-all.html",
+            { "index-all.html",
                 "" +
                 "method(Vector<Object>)"
             },
@@ -679,12 +705,12 @@
         // ENUM TESTING
         //=================================
         //NO constructor section
-        {BUG_ID + FS + "pkg" + FS + "Coin.html", "Constructor Summary"},
+        { "pkg/Coin.html", "Constructor Summary"},
         //=================================
         // TYPE PARAMETER TESTING
         //=================================
         //No type parameters in class frame.
-        {BUG_ID + FS + "allclasses-frame.html",
+        { "allclasses-frame.html",
             "" +
                     "TypeParameters<E>"
@@ -695,27 +721,27 @@
         //===============================================================
 
         //CLASS
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
-            "@AnnotationTypeUndocumented(optional=\"Class Annotation\"," + NL +
-            "                required=1994)" + NL +
+        { "pkg/AnnotationTypeUsage.html",
+            "@AnnotationTypeUndocumented(optional=\"Class Annotation\",\n" +
+            "                required=1994)\n" +
             "public class AnnotationTypeUsageextends java.lang.Object"},
 
         //FIELD
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
-            "@AnnotationTypeUndocumented(optional=\"Field Annotation\"," + NL +
-            "                required=1994)" + NL +
+        { "pkg/AnnotationTypeUsage.html",
+            "@AnnotationTypeUndocumented(optional=\"Field Annotation\",\n" +
+            "                required=1994)\n" +
             "public int field"},
 
         //CONSTRUCTOR
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
-            "@AnnotationTypeUndocumented(optional=\"Constructor Annotation\"," + NL +
-            "                required=1994)" + NL +
+        { "pkg/AnnotationTypeUsage.html",
+            "@AnnotationTypeUndocumented(optional=\"Constructor Annotation\",\n" +
+            "                required=1994)\n" +
             "public AnnotationTypeUsage()"},
 
         //METHOD
-        {BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
-            "@AnnotationTypeUndocumented(optional=\"Method Annotation\"," + NL +
-            "                required=1994)" + NL +
+        { "pkg/AnnotationTypeUsage.html",
+            "@AnnotationTypeUndocumented(optional=\"Method Annotation\",\n" +
+            "                required=1994)\n" +
             "public void method()"},
 
         //=================================
@@ -733,21 +759,7 @@
      */
     public static void main(String[] args) {
         TestNewLanguageFeatures tester = new TestNewLanguageFeatures();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
--- a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -35,13 +35,10 @@
 
 public class TestNoPackagesFile extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4475679";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR,
-        SRC_DIR + FS + "C.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
+        SRC_DIR + "/C.java"
     };
 
     /**
@@ -50,25 +47,11 @@
      */
     public static void main(String[] args) {
         TestNoPackagesFile tester = new TestNoPackagesFile();
-        run(tester, ARGS, NO_TEST, NO_TEST);
-        if ((new java.io.File(BUG_ID + FS + "packages.html")).exists()) {
+        tester.run(ARGS, NO_TEST, NO_TEST);
+        if ((new java.io.File(OUTPUT_DIR + "/packages.html")).exists()) {
             throw new Error("Test Fails: packages file should not be " +                "generated anymore.");
         } else {
             System.out.println("Test passes:  packages.html not found.");
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java
--- a/langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -33,16 +33,15 @@
 
 public class TestNonFrameWarning extends JavadocTester {
 
-    private static final String BUG_ID = "7001086";
     private static final String[][] TEST = {
-        {BUG_ID + FS + "index.html",
+        { "index.html",
             "This document is designed to be viewed using the frames feature. " +
             "If you see this message, you are using a non-frame-capable web client. " +
             "Link to Non-frame version."
         }
     };
     private static final String[] ARGS = new String[]{
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     /**
@@ -51,21 +50,7 @@
      */
     public static void main(String[] args) {
         TestNonFrameWarning tester = new TestNonFrameWarning();
-        run(tester, ARGS, TEST, NO_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
--- a/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -36,12 +36,9 @@
 
 public class TestNotifications extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4657239";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     private static final String[] ARGS2 = new String[] {
@@ -50,10 +47,10 @@
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {NOTICE_OUTPUT, "Creating destination directory: \"4657239"}
+        {NOTICE_OUTPUT, "Creating destination directory: \"" + OUTPUT_DIR}
     };
     private static final String[][] NEGATED_TEST = {
-        {NOTICE_OUTPUT, "Creating destination directory: \"4657239"}
+        {NOTICE_OUTPUT, "Creating destination directory: \"" + OUTPUT_DIR}
     };
 
     private static final String[][] NEGATED_TEST2 = {
@@ -67,26 +64,12 @@
     public static void main(String[] args) {
         TestNotifications tester = new TestNotifications();
         // Notify that the destination directory must be created.
-        run(tester, ARGS, TEST, NO_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         // No need to notify that the destination must be created because
         // it already exists.
-        run(tester, ARGS, NO_TEST, NEGATED_TEST);
+        tester.run(ARGS, NO_TEST, NEGATED_TEST);
         //Make sure classname is not include in javadoc usage message.
-        run(tester, ARGS2, NO_TEST, NEGATED_TEST2);
+        tester.run(ARGS2, NO_TEST, NEGATED_TEST2);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testOptions/TestOptions.java
--- a/langtools/test/com/sun/javadoc/testOptions/TestOptions.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testOptions/TestOptions.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -33,46 +33,27 @@
 
 public class TestOptions extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4749567";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-header", "Test header", "-footer", "Test footer",
+        "-d", OUTPUT_DIR, "-header", "Test header", "-footer", "Test footer",
         "-sourcepath", SRC_DIR, "pkg"
     };
 
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
+        { "pkg/package-summary.html",
             "Test header"},
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
+        { "pkg/package-summary.html",
             "Test footer"}
     };
 
-    private static final String[][] NEGATED_TEST = NO_TEST;
-
     /**
      * The entry point of the test.
      * @param args the array of command line arguments.
      */
     public static void main(String[] args) {
         TestOptions tester = new TestOptions();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
 
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -35,29 +35,26 @@
 
 public class TestMultiInheritence extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4933335";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg3"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg3"
     };
 
     //Method foo() is inherited from BOTH I2 and I3
     private static final String[][] TEST = {
-       {BUG_ID + FS + "pkg3" + FS + "I1.html",
+       { "pkg3/I1.html",
         "Methods inherited from interface pkg3." +
                 "" +
                 "I2"},
-        {BUG_ID + FS + "pkg3" + FS +"I1.html",
+        { "pkg3/I1.html",
         "Methods inherited from interface pkg3." +
                  "" +
                  "I3"},
-        {BUG_ID + FS + "pkg3" + FS + "I0.html",
+        { "pkg3/I0.html",
         "Methods inherited from interface pkg3." +
                  "" +
                  "I2"},
-        {BUG_ID + FS + "pkg3" + FS +"I0.html",
+        { "pkg3/I0.html",
         "Methods inherited from interface pkg3." +
                  "" +
                  "I3"},
@@ -66,11 +63,11 @@
     //Method foo() is NOT inherited from I4 because it is overriden by
     //I3.
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg3" + FS + "I1.html",
+        { "pkg3/I1.html",
         "Methods inherited from interface pkg3." +
                  "" +
                  "I4"},
-        {BUG_ID + FS + "pkg3" + FS + "I0.html",
+        { "pkg3/I0.html",
         "Methods inherited from interface pkg3." +
                  "" +
                  "I4"},
@@ -82,21 +79,7 @@
      */
     public static void main(String[] args) {
         TestMultiInheritence tester = new TestMultiInheritence();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -35,23 +35,19 @@
 
 public class TestOverridenMethodDocCopy extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4368820";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
+        { "pkg1/SubClass.html",
             "Description copied from class: " +
             "" +
             "BaseClass"
         }
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -59,21 +55,7 @@
      */
     public static void main(String[] args) {
         TestOverridenMethodDocCopy tester = new TestOverridenMethodDocCopy();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,17 +35,15 @@
 
 public class TestOverridenPrivateMethods extends JavadocTester {
 
-    private static final String BUG_ID = "4634891";
-
     private static final String[][] TEST = {
         //The public method should be overriden
-        {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
-         "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "Overrides:\n" +
                  "Overrides:" + NL +
+        { "pkg2/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg2/SubClass.html",
+         "
Overrides:
\n" +
                  "
Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "
Overrides:
\n" +
                  "" +
                  "publicMethod in class " +
                  "BaseClass"},
 
         //The public method in different package should be overriden
-        {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
-         "Overrides:" + NL +
+        { "pkg2/SubClass.html",
+         "Overrides:\n" +
                  "" +
                  "publicMethod in class " +
                  "BaseClass"},
 
         //The package private method should be overriden since the base and sub class are in the same
         //package.
-        {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
-         "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "Overrides:\n" +
                  "" +
                  "packagePrivateMethod in class " +
                  "BaseClass"}
@@ -64,25 +62,25 @@
     private static final String[][] NEGATED_TEST = {
 
         //The private method in should not be overriden
-        {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
-         "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "Overrides:\n" +
                  ""},
 
         //The private method in different package should not be overriden
-        {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
-         "
Overrides:
" + NL +
+        { "pkg2/SubClass.html",
+         "Overrides:\n" +
                  ""},
 
         //The package private method should not be overriden since the base and sub class are in
         //different packages.
-        {BUG_ID + FS + "pkg2" + FS + "SubClass.html",
-         "
Overrides:
" + NL +
+        { "pkg2/SubClass.html",
+         "Overrides:\n" +
                  ""},
     };
 
     private static final String[] ARGS =
         new String[] {
-            "-d", BUG_ID, "-sourcepath", SRC_DIR, "-package", "pkg1", "pkg2"};
+            "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-package", "pkg1", "pkg2"};
 
     /**
      * The entry point of the test.
@@ -90,21 +88,7 @@
      */
     public static void main(String[] args) {
         TestOverridenPrivateMethodsWithPackageFlag tester = new TestOverridenPrivateMethodsWithPackageFlag();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,42 +35,40 @@
 
 public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
 
-    private static final String BUG_ID = "4634891";
-
     private static final String[][] TEST = {
         //The public method should be overriden
-        {BUG_ID + FS + "pkg1" + FS + "SubClass.html",
-         "
Overrides:
" + NL +
+        { "pkg1/SubClass.html",
+         "Overrides:\n" +
                  "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg2/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg1/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg2/SubClass.html",
+         "
Overrides:
\n" +
                  "Overrides:" + NL +
+        { "pkg2/SubClass.html",
+         "
Overrides:
\n" +
                  "Deprecated." + NL +
+        { "pkg1/package-summary.html",
+            "Deprecated.\n" +
             "This package is Deprecated." +
             ""
         },
-        {BUG_ID + "-1" + FS + "deprecated-list.html",
+        { "deprecated-list.html",
             "Deprecated Packages"
         }
     };
-    private static final String[][] TEST2 = NO_TEST;
-    private static final String[][] NEGATED_TEST1 = NO_TEST;
     private static final String[][] NEGATED_TEST2 = {
-        {BUG_ID + "-2" + FS + "overview-summary.html", "pkg1"},
-        {BUG_ID + "-2" + FS + "allclasses-frame.html", "FooDepr"}
+        { "overview-summary.html", "pkg1"},
+        { "allclasses-frame.html", "FooDepr"}
     };
 
     /**
@@ -70,16 +65,16 @@
      */
     public static void main(String[] args) {
         TestPackageDeprecation tester = new TestPackageDeprecation();
-        run(tester, ARGS1, TEST1, NEGATED_TEST1);
-        run(tester, ARGS2, TEST2, NEGATED_TEST2);
-        if ((new java.io.File(BUG_ID + "-2" + FS + "pkg1" + FS +
+        tester.run(ARGS1, TEST1, NO_TEST);
+        tester.run(ARGS2, NO_TEST, NEGATED_TEST2);
+        if ((new java.io.File(OUTPUT_DIR + "-2/pkg1/" +
                 "package-summary.html")).exists()) {
             throw new Error("Test Fails: packages summary should not be" +
                     "generated for deprecated package.");
         } else {
             System.out.println("Test passes:  package-summary.html not found.");
         }
-        if ((new java.io.File(BUG_ID + "-2" + FS + "FooDepr.html")).exists()) {
+        if ((new java.io.File(OUTPUT_DIR + "-2/FooDepr.html")).exists()) {
             throw new Error("Test Fails: FooDepr should not be" +
                     "generated as it is deprecated.");
         } else {
@@ -87,18 +82,4 @@
         }
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -36,51 +36,50 @@
 
 public class TestPackagePage extends JavadocTester {
 
-    private static final String BUG_ID = "4492643-4689286";
     private static final String[][] TEST1 = {
-        {BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-summary.html",
+        { "com/pkg/package-summary.html",
             "This is a package page."
         },
         //With just one package, all general pages link to the single package page.
-        {BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "C.html",
+        { "com/pkg/C.html",
             "Package"
         },
-        {BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-tree.html",
+        { "com/pkg/package-tree.html",
             "Package"
         },
-        {BUG_ID + "-1" + FS + "deprecated-list.html",
+        { "deprecated-list.html",
             "Package"
         },
-        {BUG_ID + "-1" + FS + "index-all.html",
+        { "index-all.html",
             "Package"
         },
-        {BUG_ID + "-1" + FS + "help-doc.html",
+        { "help-doc.html",
             "Package"
         },
     };
 
     private static final String[][] TEST2 = {
         //With multiple packages, there is no package link in general pages.
-        {BUG_ID + "-2" + FS + "deprecated-list.html",
+        { "deprecated-list.html",
             "Package"
         },
-        {BUG_ID + "-2" + FS + "index-all.html",
+        { "index-all.html",
             "Package"
         },
-        {BUG_ID + "-2" + FS + "help-doc.html",
+        { "help-doc.html",
             "Package"
         },
     };
 
     private static final String[] ARGS1 =
         new String[] {
-            "-d", BUG_ID + "-1", "-sourcepath", SRC_DIR,
-            SRC_DIR + FS + "com" + FS + "pkg" + FS + "C.java"
+            "-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR,
+            SRC_DIR + "/com/pkg/C.java"
         };
 
     private static final String[] ARGS2 =
         new String[] {
-            "-d", BUG_ID + "-2", "-sourcepath", SRC_DIR,
+            "-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR,
             "com.pkg", "pkg2"
         };
 
@@ -90,22 +89,8 @@
      */
     public static void main(String[] args) {
         TestPackagePage tester = new TestPackagePage();
-        run(tester, ARGS1, TEST1, NO_TEST);
-        run(tester, ARGS2, TEST2, NO_TEST);
+        tester.run(ARGS1, TEST1, NO_TEST);
+        tester.run(ARGS2, TEST2, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -36,36 +36,34 @@
 
 public class TestParamTaglet extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4802275-4967243";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
         //Regular param tags.
-        {BUG_ID + FS + "pkg" + FS + "C.html",
-            "Parameters:" + NL + "
param1 - testing 1 2 3.
" +
-                NL + "param2 - testing 1 2 3."
+        { "pkg/C.html",
+            "Parameters:\n" +
+            "
param1 - testing 1 2 3.\n" +
+                "param2 - testing 1 2 3."
         },
         //Param tags that don't match with any real parameters.
-        {BUG_ID + FS + "pkg" + FS + "C.html",
-            "Parameters:" + NL + "
p1 - testing 1 2 3." +
-                NL + "p2 - testing 1 2 3."
+        { "pkg/C.html",
+            "Parameters:\n" +
+            "
p1 - testing 1 2 3.\n" +
+                "p2 - testing 1 2 3."
         },
         //{@inherit} doc misuse does not cause doclet to throw exception.
         // Param is printed with nothing inherited.
         //XXX: in the future when Configuration is available during doc inheritence,
         //print a warning for this mistake.
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "inheritBug -"
         },
 
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -73,21 +71,7 @@
      */
     public static void main(String[] args) {
         TestParamTaglet tester = new TestParamTaglet();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -44,194 +44,204 @@
 
 public class TestPrivateClasses extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4780441-4874845-4978816-8014017";
-
     //Javadoc arguments.
     private static final String[] ARGS1 = new String[] {
-        "-d", BUG_ID + "-1", "-sourcepath", SRC_DIR, "pkg", "pkg2"
+        "-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR, "pkg", "pkg2"
     };
     private static final String[] ARGS2 = new String[] {
-        "-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-private",
+        "-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, "-private",
             "pkg", "pkg2"
     };
 
     // Test output when -private flag is not used.
     private static final String[][] TEST1 = {
         // Field inheritence from non-public superclass.
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "" +
                 "fieldInheritedFromParent"
         },
 
         // Method inheritence from non-public superclass.
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "" +
                 "methodInheritedFromParent"
         },
 
         // Field inheritence from non-public superinterface.
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
+        { "pkg/PublicInterface.html",
             "" +
                 "fieldInheritedFromInterface"
         },
 
         // Method inheritence from non-public superinterface.
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
+        { "pkg/PublicInterface.html",
             "" +
                 "methodInterface"
         },
 
         // private class does not show up in tree
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
-            "" + NL + "java.lang.Object" + NL +
-            "" + NL + "" + NL + "pkg.PublicChild" + NL +
-            "
" + NL + "
" + NL + ""
+        { "pkg/PublicChild.html",
+            "\n" +
+            "java.lang.Object\n" +
+            "\n" +
+            "\n" +
+            "pkg.PublicChild\n" +
+            "\n" +
+            "\n" +
+            ""
         },
 
         // Method is documented as though it is declared in the inheriting method.
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "public void methodInheritedFromParent(int p1)"
         },
 
         //Make sure implemented interfaces from private superclass are inherited
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
-            "" + NL + "All Known Implementing Classes:" + NL +
+        { "pkg/PublicInterface.html",
+            "\n" +
+            "All Known Implementing Classes:\n" +
             "" +
-            "PublicChild
" + NL + ""},
+            "PublicChild\n" +
+            ""},
 
-        {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
-            "" + NL + "All Implemented Interfaces:" + NL +
+        { "pkg/PublicChild.html",
+            "\n" +
+            "All Implemented Interfaces:\n" +
             "" +
-            "PublicInterface
" + NL + ""},
+            "PublicInterface\n" +
+            ""},
 
         //Generic interface method test.
-        {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
+        { "pkg2/C.html",
             "This comment should get copied to the implementing class"},
     };
     private static final String[][] NEGATED_TEST1 = {
        // Should not document that a method overrides method from private class.
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "Overrides:"},
       // Should not document that a method specified by private interface.
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "Specified by:"},
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
+      { "pkg/PublicInterface.html",
         "Specified by:"},
       // Should not mention that any documentation was copied.
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "Description copied from"},
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
+      { "pkg/PublicInterface.html",
         "Description copied from"},
       // Don't extend private classes or interfaces
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "PrivateParent"},
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
+      { "pkg/PublicInterface.html",
         "PrivateInterface"},
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "PrivateInterface"},
-      {BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
+      { "pkg/PublicInterface.html",
         "All Superinterfaces"},
       // Make inherited constant are documented correctly.
-      {BUG_ID + "-1" + FS + "constant-values.html",
+      { "constant-values.html",
         "PrivateInterface"},
 
         //Do not inherit private interface method with generic parameters.
         //This method has been implemented.
-        {BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
+        { "pkg2/C.html",
             "hello"},
     };
 
     // Test output when -private flag is used.
     private static final String[][] TEST2 = {
         // Field inheritence from non-public superclass.
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "Fields inherited from class pkg." +
             "" +
             "PrivateParent"
         },
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "" +
                 "fieldInheritedFromParent"
         },
         // Field inheritence from non-public superinterface.
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
+        { "pkg/PublicInterface.html",
             "Fields inherited from interface pkg." +
             "" +
             "PrivateInterface"
         },
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
+        { "pkg/PublicInterface.html",
             "" +
                 "fieldInheritedFromInterface"
         },
         // Method inheritence from non-public superclass.
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "Methods inherited from class pkg." +
             "" +
             "PrivateParent"
         },
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+        { "pkg/PublicChild.html",
             "" +
                 "methodInheritedFromParent"
         },
         // Should document that a method overrides method from private class.
-       {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
-            "Overrides:" + NL +
+       { "pkg/PublicChild.html",
+            "Overrides:\n" +
             "" +
             "methodOverridenFromParent in class " +
             "" +
             "PrivateParent"},
        // Should document that a method is specified by private interface.
-       {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
-            "Specified by:" + NL +
+       { "pkg/PublicChild.html",
+            "Specified by:\n" +
             "" +
             "methodInterface in interface " +
             "" +
             "PrivateInterface"},
        // Method inheritence from non-public superinterface.
-       {BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
+       { "pkg/PublicInterface.html",
             "Methods inherited from interface pkg." +
             "" +
             "PrivateInterface"
         },
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateInterface.html",
+        { "pkg/PrivateInterface.html",
             "" +
                 "methodInterface"
         },
       // Should mention that any documentation was copied.
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "Description copied from"},
       // Extend documented private classes or interfaces
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
         "extends"},
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
+      { "pkg/PublicInterface.html",
         "extends"},
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
+      { "pkg/PublicInterface.html",
         "All Superinterfaces"},
 
       //Make sure implemented interfaces from private superclass are inherited
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
-        "" + NL + "All Known Implementing Classes:" + NL +
+      { "pkg/PublicInterface.html",
+        "\n" +
+        "All Known Implementing Classes:\n" +
         "" +
         "PrivateParent, " +
         "PublicChild" +
-        "
" + NL + ""},
+        "\n" +
+        ""},
 
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
-        "" + NL + "All Implemented Interfaces:" + NL +
+      { "pkg/PublicChild.html",
+        "\n" +
+        "All Implemented Interfaces:\n" +
         "" +
         "PrivateInterface, " +
         "" +
-        "PublicInterface
" + NL + ""},
+        "PublicInterface\n" +
+        ""},
 
       //Since private flag is used, we can document that private interface method
       //with generic parameters has been implemented.
-      {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
+      { "pkg2/C.html",
             "Description copied from interface: " +
             "I"},
 
-      {BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
-            "Specified by:" + NL +
+      { "pkg2/C.html",
+            "Specified by:\n" +
             "hello" +
             " in interface " +
             "I" +
@@ -239,14 +249,14 @@
 
       //Make sure when no modifier appear in the class signature, the
       //signature is displayed correctly without extra space at the beginning.
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
+      { "pkg/PrivateParent.html",
             "class PrivateParent"},
 
-      {BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
+      { "pkg/PublicChild.html",
             "public class PublicChild"},
     };
     private static final String[][] NEGATED_TEST2 = {
-        {BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
+        { "pkg/PrivateParent.html",
             " class PrivateParent"},
     };
 
@@ -256,22 +266,8 @@
      */
     public static void main(String[] args) {
         TestPrivateClasses tester = new TestPrivateClasses();
-        run(tester, ARGS1, TEST1, NEGATED_TEST1);
-        run(tester, ARGS2, TEST2, NEGATED_TEST2);
+        tester.run(ARGS1, TEST1, NEGATED_TEST1);
+        tester.run(ARGS2, TEST2, NEGATED_TEST2);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -33,216 +33,245 @@
 public class TestProfiles extends JavadocTester {
 
     //Test information.
-    private static final String BUG_ID = "8006124-8009684-8016921";
-    private static final String PROFILE_BUG_ID = BUG_ID + "-1";
-    private static final String PACKAGE_BUG_ID = BUG_ID + "-2";
+    private static final String PROFILE_OUTPUT_DIR = OUTPUT_DIR + "-1";
+    private static final String PACKAGE_OUTPUT_DIR = OUTPUT_DIR + "-2";
     //Javadoc arguments.
     private static final String[] ARGS1 = new String[]{
-        "-d", PROFILE_BUG_ID, "-sourcepath", SRC_DIR, "-Xprofilespath",
-         SRC_DIR + FS + "profile-rtjar-includes.txt", "pkg1", "pkg2",
+        "-d", PROFILE_OUTPUT_DIR, "-sourcepath", SRC_DIR, "-Xprofilespath",
+         SRC_DIR + "/profile-rtjar-includes.txt", "pkg1", "pkg2",
          "pkg3", "pkg4", "pkg5", "pkgDeprecated"
     };
     private static final String[] ARGS2 = new String[]{
-        "-d", PACKAGE_BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2", "pkg3", "pkg4", "pkg5"
+        "-d", PACKAGE_OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2",
+        "pkg3", "pkg4", "pkg5"
     };
     //Input for string tests for profiles.
     private static final String[][] PROFILES_TEST = {
         // Tests for profile-overview-frame.html listing all profiles.
-        {PROFILE_BUG_ID + FS + "profile-overview-frame.html",
+        { "profile-overview-frame.html",
             "All Packages"
         },
-        {PROFILE_BUG_ID + FS + "profile-overview-frame.html",
+        { "profile-overview-frame.html",
             ""
             + "compact1"
         },
         // Tests for profileName-frame.html listing all packages in a profile.
-        {PROFILE_BUG_ID + FS + "compact2-frame.html",
+        { "compact2-frame.html",
             ""
             + "All PackagesAll Profiles"
         },
-        {PROFILE_BUG_ID + FS + "compact2-frame.html",
+        { "compact2-frame.html",
             "pkg4"
         },
         // Test for profileName-package-frame.html listing all types in a
         // package of a profile.
-        {PROFILE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
+        { "pkg2/compact2-package-frame.html",
             ""
             + "compact2 - pkg2"
         },
         // Tests for profileName-summary.html listing the summary for a profile.
-        {PROFILE_BUG_ID + FS + "compact2-summary.html",
-            "Prev Profile" + NL
+        { "compact2-summary.html",
+            "Prev Profile\n"
             + "Next Profile"
         },
-        {PROFILE_BUG_ID + FS + "compact2-summary.html",
+        { "compact2-summary.html",
             "Profile compact2"
         },
-        {PROFILE_BUG_ID + FS + "compact2-summary.html",
+        { "compact2-summary.html",
             "pkg2"
         },
-        {PROFILE_BUG_ID + FS + "compact2-summary.html",
-            "" + NL + "" + NL
+        { "compact2-summary.html",
+            "\n" +
+            "\n"
             + ""
-            + "pkg2" + NL + "\n" +
+            ""
         },
-        {PROFILE_BUG_ID + FS + "compact2-summary.html",
-            "" + NL + "" + NL
+        { "compact2-summary.html",
+            "\n" +
+            "\n"
             + ""
-            + "pkg4
" + NL + "
\n" +
+            ""
         },
         // Tests for profileName-package-summary.html listing the summary for a
         // package in a profile.
-        {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
+        { "pkg5/compact3-package-summary.html",
             "Prev Package"
             + ""
         },
-        {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
+        { "pkg5/compact3-package-summary.html",
             "compact3"
         },
-        {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
-            "" + NL + "" + NL
+        { "pkg5/compact3-package-summary.html",
+            "\n" +
+            "\n"
             + "
"
         },
         //Test for "overview-frame.html" showing the "All Profiles" link.
-        {PROFILE_BUG_ID + FS + "overview-frame.html",
+        { "overview-frame.html",
             "All Profiles"
         },
         //Test for "className.html" showing the profile information for the type.
-        {PROFILE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
+        { "pkg2/Class1Pkg2.html",
             "compact1, compact2, compact3"
         },
-        {PROFILE_BUG_ID + FS + "index.html",
+        { "index.html",
             ""
         },
         //Test for "overview-summary.html" showing the profile list.
-        {PROFILE_BUG_ID + FS + "overview-summary.html",
-            "" + NL +"" +
-            "compact1
" + NL + "compact2
" + NL + "compact3" + NL +
+        { "overview-summary.html",
+            "\n" +
+            "" +
+            "compact1\n" +
+            "compact2\n" +
+            "compact3\n" +
             ""
         },
         //Test deprecated class in profiles
-        {PROFILE_BUG_ID + FS + "compact1-summary.html",""
-            + NL + "\n"
+            + ""
-            + "Class1Pkg2 Deprecated"
+        { "compact1-summary.html",
+            " Class1Pkg2 Deprecated"
         },
-        {PROFILE_BUG_ID + FS + "deprecated-list.html"," "
-            + "pkg2.Class1Pkg2"
-            + NL +"Class1Pkg2. This class is deprecated"
+        { "deprecated-list.html",
+            " pkg2.Class1Pkg2\n"
+            +"Class1Pkg2. This class is deprecated"
         },
         //Test deprecated package in profile
-        {PROFILE_BUG_ID + FS + "deprecated-list.html"," "
-            + "pkgDeprecated"
-            + NL +"This package is Deprecated."
+        { "deprecated-list.html",
+            " pkgDeprecated\n"
+            +"This package is Deprecated."
             + " Use pkg1."
         },
-        {PROFILE_BUG_ID + FS + "pkgDeprecated" + FS + "package-summary.html",
-            "Deprecated."
-            + NL + "This package is Deprecated."
+        { "pkgDeprecated/package-summary.html",
+            "Deprecated.\n"
+            + "This package is Deprecated."
             + " Use pkg1."
         },
         // need to add teststring when JDK-8015496 will be fixed
         //Test exception in profiles
-        {PROFILE_BUG_ID + FS + "compact1-summary.html",""
-            + NL + "" + NL + "" + NL + "" + NL + "" + NL + "" + NL + "" + NL + ""
-            + NL + "\n" +
+            "\n" +
+            "\n" +
+            "\n" +
+            "\n" +
+            "\n" +
+            "\n"
+            + ""
         },
         //Test errors in profiles
-        {PROFILE_BUG_ID + FS + "compact1-summary.html",
+        { "compact1-summary.html",
             "Exception Summary"
-            + " Exception "
-            + "Description
\n"
+            + "
Exception Summary"
+            + " Exception "
+            + "Description
ClassException"
-            + NL + "" + NL + "" + NL + "" + NL + "" + NL + "" + NL + ""
-            + NL + "" + NL + "\n" +
+            "\n" +
+            "\n" +
+            "\n" +
+            "\n" +
+            "\n"
+            + "\n" +
+            ""
         }
     };
     private static final String[][] PROFILES_NEGATED_TEST = {
-        {PROFILE_BUG_ID + FS + "pkg3" + FS + "Class2Pkg3.html",
+        { "pkg3/Class2Pkg3.html",
             "compact1"
         },
-        {PROFILE_BUG_ID + FS + "pkg3" + FS + "Interface1Pkg3.html",
+        { "pkg3/Interface1Pkg3.html",
             "compact1"
         },
-        {PROFILE_BUG_ID + FS + "pkg4" + FS + "compact2-package-frame.html",
+        { "pkg4/compact2-package-frame.html",
             "Anno1Pkg4"
         },
-        {PROFILE_BUG_ID + FS + "compact1-summary.html","Use"
+        { "compact1-summary.html","Use"
         },
-        {PROFILE_BUG_ID + FS + "compact2-summary.html",
-            "" + NL + "" + NL
+        { "compact2-summary.html",
+            "\n" +
+            "\n"
             + ""
-            + "pkg2
" + NL + "
" + NL
+            + "pkg2\n" +
+            "
\n"
             + "
Error Summary "
-            + "Error Description
"
+            + "summary=\"Error Summary table, listing errors, and an explanation\">\n"
+            + "
Error Summary "
+            + "Error Description
"
             + "ClassError"
         },
-        {PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
-            "" + NL + "" + NL
-            + "
" + NL
+        { "pkg5/compact3-package-summary.html",
+            "\n" +
+            "\n"
+            + "
\n"
             + "
"
         }
     };
     private static final String[][] PACKAGES_TEST = {
-        {PACKAGE_BUG_ID + FS + "overview-frame.html",
+        { "overview-frame.html",
             "Packages"
         },
-        {PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-frame.html",
+        { "pkg4/package-frame.html",
             "pkg4"
         },
-        {PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-summary.html",
-            "" + NL + "Package pkg4
" + NL + ""
+        { "pkg4/package-summary.html",
+            "\n" +
+            "Package pkg4\n" +
+            ""
         }
     };
     private static final String[][] PACKAGES_NEGATED_TEST = {
-        {PACKAGE_BUG_ID + FS + "overview-frame.html",
+        { "overview-frame.html",
             "All Profiles"
         },
-        {PACKAGE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
+        { "pkg2/Class1Pkg2.html",
             "compact1, compact2, compact3"
         },
-        {PACKAGE_BUG_ID + FS + "overview-summary.html",
-            "" + NL +"" +
-            "compact1
" + NL + "compact2
" + NL + "compact3" + NL +
+        { "overview-summary.html",
+            "\n" +
+            "" +
+            "compact1\n" +
+            "compact2\n" +
+            "compact3\n" +
             ""
         }
     };
     private static final String[] PACKAGES_NEGATED_FILE_TEST = {
-        PACKAGE_BUG_ID + FS + "profile-overview-frame.html",
-        PACKAGE_BUG_ID + FS + "compact2-frame.html",
-        PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
-        PACKAGE_BUG_ID + FS + "compact2-summary.html",
-        PACKAGE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html"
+        "profile-overview-frame.html",
+        "compact2-frame.html",
+        "pkg2/compact2-package-frame.html",
+        "compact2-summary.html",
+        "pkg5/compact3-package-summary.html"
     };
 
     /**
@@ -252,22 +281,8 @@
      */
     public static void main(String[] args) {
         TestProfiles tester = new TestProfiles();
-        run(tester, ARGS1, PROFILES_TEST, PROFILES_NEGATED_TEST);
-        run(tester, ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST, NO_FILE_TEST, PACKAGES_NEGATED_FILE_TEST);
+        tester.run(ARGS1, PROFILES_TEST, PROFILES_NEGATED_TEST);
+        tester.run(ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST, NO_FILE_TEST, PACKAGES_NEGATED_FILE_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -33,66 +33,75 @@
 public class TestProfilesConfiguration extends JavadocTester {
 
     //Test information.
-    private static final String BUG_ID = "8006124-8009684";
-    private static final String PROFILE_CONFIGURATION_BUG_ID = BUG_ID + "-3";
-    private static final String NODEPR_NOPKGS_BUG_ID = BUG_ID + "-4";
+    private static final String PROFILE_CONFIGURATION_OUTPUT_DIR = OUTPUT_DIR + "-3";
+    private static final String NODEPR_NOPKGS_OUTPUT_DIR = OUTPUT_DIR + "-4";
     //Javadoc arguments.
     private static final String[] ARGS3 = new String[]{
-        "-d", PROFILE_CONFIGURATION_BUG_ID, "-sourcepath", SRC_DIR, "-nocomment",
-        "-keywords", "-Xprofilespath", SRC_DIR + FS + "profile-rtjar-includes.txt",
-        "-doctitle", "Simple doctitle", "-use", "pkg3", "pkg1", "pkg2", "pkg4",
+        "-d", PROFILE_CONFIGURATION_OUTPUT_DIR, "-sourcepath", SRC_DIR,
+        "-nocomment", "-keywords", "-Xprofilespath", SRC_DIR +
+        "/profile-rtjar-includes.txt", "-doctitle", "Simple doctitle",
+        "-use", "pkg3", "pkg1", "pkg2", "pkg4",
         "pkg5", "-packagesheader", "Simple packages header","pkgDeprecated"
     };
     private static final String[] ARGS4 = new String[]{
-        "-d", NODEPR_NOPKGS_BUG_ID, "-sourcepath", SRC_DIR, "-nocomment", "-nodeprecated",
-        "-keywords", "-Xprofilespath", SRC_DIR + FS + "profile-rtjar-includes-nopkgs.txt",
-        "-doctitle", "Simple doctitle", "-use", "-packagesheader", "Simple packages header",
+        "-d", NODEPR_NOPKGS_OUTPUT_DIR, "-sourcepath", SRC_DIR, "-nocomment",
+        "-nodeprecated", "-keywords", "-Xprofilespath", SRC_DIR +
+        "/profile-rtjar-includes-nopkgs.txt", "-doctitle", "Simple doctitle",
+        "-use", "-packagesheader", "Simple packages header",
         "pkg1", "pkg2", "pkg3", "pkg4", "pkg5", "pkgDeprecated"
     };
     private static final String[][] NODEPR_NOPKGS_TEST = {
-        {NODEPR_NOPKGS_BUG_ID + FS + "overview-summary.html",
-            "" + NL + "" +
-            "compact2
" + NL + "compact3
" + NL + ""
+        { "overview-summary.html",
+            "\n" +
+            "" +
+            "compact2\n" +
+            "compact3\n" +
+            ""
         },
-        {NODEPR_NOPKGS_BUG_ID + FS + "profile-overview-frame.html",
-            "" + NL + "" +
-            "compact2
" + NL + "compact3
" + NL + ""
+        { "profile-overview-frame.html",
+            "\n" +
+            "" +
+            "compact2\n" +
+            "compact3\n" +
+            ""
         }
     };
     private static final String[][] NODEPR_NOPKGS_NEGATED_TEST = {
-        {NODEPR_NOPKGS_BUG_ID + FS + "overview-summary.html",
+        { "overview-summary.html",
             "compact1"
         }
     };
 
     private static final String[][] PROFILES_CONFIGURATION_TEST = {
         //-use option test string fo profile view page
-        {PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html","Use"
+        { "compact1-summary.html","Use"
         },
         //-doctitle option test string
-        {PROFILE_CONFIGURATION_BUG_ID + FS + "overview-summary.html",
-            "" + NL + "Simple doctitle"
+        { "overview-summary.html",
+            "\n" +
+            "Simple doctitle"
         },
         //-packagesheader option test string fo profiles
-        {PROFILE_CONFIGURATION_BUG_ID + FS + "profile-overview-frame.html",
+        { "profile-overview-frame.html",
             "Simple packages header"
         },
         //-keywords option test string for profiles
-        {PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html",
+        { "compact1-summary.html",
             ""
         },
         //Deprecated information on a package
-        {PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html",
+        { "compact1-summary.html",
             "pkgDeprecated
" + NL + "" +
+            "classFrame\">pkgDeprecated\n" +
+            "" +
             "Deprecated."
         }
     };
     private static final String[][] PROFILES_CONFIGURATION_NEGATED_TEST = {
         //-nocomments option test string
-        {PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html",
+        { "compact1-summary.html",
             "Class1Pkg2."
         }
     };
@@ -104,24 +113,10 @@
      */
     public static void main(String[] args) {
         TestProfilesConfiguration tester = new TestProfilesConfiguration();
-        run(tester, ARGS3, PROFILES_CONFIGURATION_TEST,
+        tester.run(ARGS3, PROFILES_CONFIGURATION_TEST,
         PROFILES_CONFIGURATION_NEGATED_TEST);
-        run(tester, ARGS4, NODEPR_NOPKGS_TEST,
+        tester.run(ARGS4, NODEPR_NOPKGS_TEST,
         NODEPR_NOPKGS_NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -34,10 +34,9 @@
 
 public class TestRecurseSubPackages extends JavadocTester {
 
-    private static final String BUG_ID = "4074234";
     private static final String[] ARGS =
         new String[] {
-            "-d", BUG_ID, "-sourcepath", SRC_DIR,
+            "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
             "-subpackages", "pkg1", "-exclude", "pkg1.pkg2.packageToExclude"
         };
 
@@ -48,28 +47,14 @@
     public static void main(String[] args) {
         String[][] tests = new String[6][2];
         for (int i = 0; i < tests.length; i++) {
-            tests[i][0] = BUG_ID + FS + "allclasses-frame.html";
+            tests[i][0] = "allclasses-frame.html";
             tests[i][1] = "C" + (i+1) + ".html";
         }
         String[][] negatedTests = new String[][] {
-            {BUG_ID + FS + "allclasses-frame.html", "DummyClass.html"}
+            { "allclasses-frame.html", "DummyClass.html"}
         };
         TestRecurseSubPackages tester = new TestRecurseSubPackages();
-        run(tester, ARGS, tests, negatedTests);
+        tester.run(ARGS, tests, negatedTests);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -35,71 +35,65 @@
 
 public class TestRelativeLinks extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4460354-8014636";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-use", "-sourcepath", SRC_DIR, "pkg", "pkg2"
+        "-d", OUTPUT_DIR, "-use", "-sourcepath", SRC_DIR, "pkg", "pkg2"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
         //These relative paths should stay relative because they appear
         //in the right places.
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "relative class link"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "relative field link"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "relative method link"},
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
+        { "pkg/package-summary.html",
             "relative package link"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
-            " relative-multi-line-link."},
 
         //These relative paths should be redirected because they are in different
         //places.
 
         //INDEX PAGE
-        {BUG_ID + FS + "index-all.html",
+        { "index-all.html",
             "relative class link"},
-        {BUG_ID + FS + "index-all.html",
+        { "index-all.html",
             "relative field link"},
-        {BUG_ID + FS + "index-all.html",
+        { "index-all.html",
             "relative method link"},
-        {BUG_ID + FS + "index-all.html",
+        { "index-all.html",
             "relative package link"},
-        {BUG_ID + FS + "index-all.html",
-            " relative-multi-line-link."},
 
 
         //PACKAGE USE
-        {BUG_ID + FS + "pkg" + FS + "package-use.html",
+        { "pkg/package-use.html",
             "relative package link."},
-        {BUG_ID + FS + "pkg" + FS + "package-use.html",
+        { "pkg/package-use.html",
             "relative class link"},
 
         //CLASS_USE
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
+        { "pkg/class-use/C.html",
             "relative field link"},
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
+        { "pkg/class-use/C.html",
             "relative method link"},
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
+        { "pkg/class-use/C.html",
             "relative package link"},
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
-            " relative-multi-line-link."},
 
         //PACKAGE OVERVIEW
-        {BUG_ID + FS + "overview-summary.html",
+        { "overview-summary.html",
             "relative package link"},
-
-
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -107,21 +101,7 @@
      */
     public static void main(String[] args) {
         TestRelativeLinks tester = new TestRelativeLinks();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, 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
@@ -34,26 +34,25 @@
 public class TestRepeatedAnnotations extends JavadocTester {
 
     //Test information.
-    private static final String BUG_ID = "8005092";
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "pkg1"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "pkg1"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@ContaineeSynthDoc " +
             "@ContaineeSynthDoc"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@ContaineeRegDoc " +
             "@ContaineeRegDoc"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@RegContainerDoc" +
             "(value={" +
@@ -61,41 +60,41 @@
             "title=\"annotation in pkg\">@RegContaineeNotDoc," +
             "@RegContaineeNotDoc})"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@ContaineeSynthDoc " +
             "@ContaineeSynthDoc " +
             "@ContaineeSynthDoc"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@ContainerSynthDoc(" +
             "value=" +
             "@ContaineeSynthDoc)"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@ContaineeSynthDoc " +
             "@ContaineeSynthDoc"},
 
-        {BUG_ID + FS + "pkg" + FS + "D.html",
+        { "pkg/D.html",
             "@RegDoc" +
             "(x=1)"},
-        {BUG_ID + FS + "pkg" + FS + "D.html",
+        { "pkg/D.html",
             "@RegArryDoc" +
             "(y=1)"},
-        {BUG_ID + FS + "pkg" + FS + "D.html",
+        { "pkg/D.html",
             "@RegArryDoc" +
             "(y={1,2})"},
-        {BUG_ID + FS + "pkg" + FS + "D.html",
+        { "pkg/D.html",
             "@NonSynthDocContainer" +
             "(value=" +
             "@RegArryDoc)"},
 
-        {BUG_ID + FS + "pkg1" + FS + "C.html",
+        { "pkg1/C.html",
             "@RegContainerValDoc" +
             "(value={" +
@@ -104,7 +103,7 @@
             "@RegContaineeNotDoc}," +
             "y=3)"},
-        {BUG_ID + FS + "pkg1" + FS + "C.html",
+        { "pkg1/C.html",
             "@ContainerValDoc" +
             "(value={" +
@@ -116,12 +115,12 @@
     };
 
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@RegContaineeDoc " +
             "@RegContaineeDoc"},
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "@RegContainerNotDoc" +
             "(value={" +
@@ -130,12 +129,12 @@
             "@RegContaineeNotDoc})"},
 
-        {BUG_ID + FS + "pkg1" + FS + "C.html",
+        { "pkg1/C.html",
             "@ContaineeSynthDoc " +
             "@ContaineeSynthDoc"},
-        {BUG_ID + FS + "pkg1" + FS + "C.html",
+        { "pkg1/C.html",
             "@RegContainerValNotDoc" +
             "(value={" +
@@ -144,7 +143,7 @@
             "@RegContaineeDoc}," +
             "y=4)"},
-        {BUG_ID + FS + "pkg1" + FS + "C.html",
+        { "pkg1/C.html",
             "@ContainerValNotDoc" +
             "(value={" +
@@ -153,7 +152,7 @@
             "@ContaineeNotDoc}," +
             "x=2)"},
-        {BUG_ID + FS + "pkg1" + FS + "C.html",
+        { "pkg1/C.html",
             "@ContainerSynthNotDoc(" +
             "value=" +
@@ -167,21 +166,7 @@
      */
     public static void main(String[] args) {
         TestRepeatedAnnotations tester = new TestRepeatedAnnotations();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
--- a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -34,12 +34,10 @@
 
 public class TestReturnTag extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4490068";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "TestReturnTag.java"
+        "-Xdoclint:none", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR +
+        "/TestReturnTag.java"
     };
 
     //Input for string search tests.
@@ -47,7 +45,6 @@
         {WARNING_OUTPUT,
             "warning - @return tag cannot be used in method with void return type."}
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * Trigger warning message when return tag is used on a void method.
@@ -62,21 +59,7 @@
      */
     public static void main(String[] args) {
         TestReturnTag tester = new TestReturnTag();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
--- a/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -33,10 +33,6 @@
 
 public class TestSeeTag extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "8017191";
-    private static final String OUTPUT_DIR = BUG_ID;
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
         "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
@@ -44,12 +40,12 @@
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        { OUTPUT_DIR + FS + "pkg" + FS + "Test.html",
+        { "pkg/Test.html",
           "List"
         }
     };
     private static final String[][] NEGATED_TEST = {
-        { OUTPUT_DIR + FS + "pkg" + FS + "Test.html",
+        { "pkg/Test.html",
           "<code>List</code>"
         }
     };
@@ -60,21 +56,7 @@
      */
     public static void main(String[] args) {
         TestSeeTag tester = new TestSeeTag();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
--- a/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,21 +35,16 @@
 
 public class TestSerialVersionUID extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4525039";
-    private static final String OUTPUT_DIR = "docs-" + BUG_ID;
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
         "-d", OUTPUT_DIR,
-        SRC_DIR + FS + "C.java"
+        SRC_DIR + "/C.java"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {OUTPUT_DIR + FS + "serialized-form.html", "-111111111111111L"}
+        { "serialized-form.html", "-111111111111111L"}
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -57,21 +52,7 @@
      */
     public static void main(String[] args) {
         TestSerialVersionUID tester = new TestSerialVersionUID();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Tue Apr 29 14:40:07 2014 -0700
@@ -21,9 +21,6 @@
  * questions.
  */
 
-import java.lang.*;
-import java.io.*;
-
 /*
  * @test
  * @bug 4341304 4485668 4966728 8032066
@@ -41,82 +38,83 @@
  * @run main TestSerializedForm
  */
 
-public class TestSerializedForm extends JavadocTester implements Serializable {
+import java.lang.*;
+import java.io.*;
 
-    private static final String BUG_ID = "4341304-4485668-4966728";
+public class TestSerializedForm extends JavadocTester implements Serializable {
 
     private static final String[][] TEST = {
-        {BUG_ID + FS + "serialized-form.html",
+        { "serialized-form.html",
             "protected java.lang.Object readResolve()"},
-        {BUG_ID + FS + "serialized-form.html",
+        { "serialized-form.html",
             "protected java.lang.Object writeReplace()"},
-        {BUG_ID + FS + "serialized-form.html",
+        { "serialized-form.html",
             "protected java.lang.Object readObjectNoData()"},
-        {BUG_ID + FS + "serialized-form.html",
+        { "serialized-form.html",
             "See Also"},
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " +
             "extends java.lang.Object implements Serializable"},
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.PrivateIncludeInnerClass.PriInnerClass extends " +
             "java.lang.Object implements Serializable"},
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.ProtectedInnerClass.ProInnerClass extends " +
             "java.lang.Object implements Serializable"}
     };
 
     private static final String[][] TEST_PRIVATE = {
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " +
             "extends java.lang.Object implements Serializable"},
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class " +
             "pkg1.PrivateIncludeInnerClass.PriInnerClass extends java.lang.Object implements Serializable"},
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class " +
             "pkg1.ProtectedInnerClass.ProInnerClass extends java.lang.Object implements Serializable"}
     };
 
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " +
             "extends java.lang.Object implements Serializable"},
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class " +
             "pkg1.PrivateInnerClass.PriInnerClass extends java.lang.Object implements Serializable"},
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class " +
             "pkg1.ProtectedInnerClass.ProInnerClass extends java.lang.Object implements Serializable"},
-        {BUG_ID + "/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.PublicExcludeInnerClass.PubInnerClass extends java.lang.Object implements " +
             "Serializable"}
     };
 
     private static final String[][] NEGATED_TEST_PRIVATE = {
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " +
             "extends java.lang.Object implements Serializable"},
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.PrivateInnerClass.PriInnerClass extends " +
             "java.lang.Object implements Serializable"},
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.ProtectedInnerClass.ProInnerClass extends " +
             "java.lang.Object implements Serializable"},
-        {BUG_ID + "-1/serialized-form.html",
+        { "serialized-form.html",
             "Class pkg1.PublicExcludeInnerClass.PubInnerClass " +
             "extends java.lang.Object implements Serializable"}
     };
 
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR,
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
         SRC_DIR + "/TestSerializedForm.java", "pkg1"
     };
 
     private static final String[] ARGS_PRIVATE = new String[] {
-        "-private", "-d", BUG_ID + "-1", "-sourcepath", SRC_DIR,
+        "-private", "-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR,
         SRC_DIR + "/TestSerializedForm.java", "pkg1"
     };
 
@@ -132,26 +130,12 @@
      */
     public static void main(String[] args) {
         TestSerializedForm tester = new TestSerializedForm();
-        run(tester, ARGS, TEST, NEGATED_TEST);
-        run(tester, ARGS_PRIVATE, TEST_PRIVATE, NEGATED_TEST_PRIVATE);
+        tester.run(ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS_PRIVATE, TEST_PRIVATE, NEGATED_TEST_PRIVATE);
         tester.printSummary();
     }
 
     /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
-
-    /**
      * @param s ObjectInputStream.
      * @throws IOException when there is an I/O error.
      * @serial
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2014, 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
@@ -36,52 +36,70 @@
 
 public class TestSerializedFormDeprecationInfo extends JavadocTester {
 
-    private static final String BUG_ID = "6802694";
-
     // Test for normal run of javadoc. The serialized-form.html should
     // display the inline comments, tags and deprecation information if any.
     private static final String[][] TEST_CMNT_DEPR = {
-        {BUG_ID + FS + "serialized-form.html", "" + NL +
-                 "Throws:
" + NL + "" +
-                 "java.io.IOException
"+ NL + "See Also:" +
-                 "
" + NL + "" +
-                 "C1.setUndecorated(boolean)
" + NL + ""},
-        {BUG_ID + FS + "serialized-form.html", "Deprecated." +
-                 " As of JDK version 1.5, replaced by" + NL +
+        { "serialized-form.html", "\n" +
+                 "Throws:\n" +
+                 "" +
+                 "java.io.IOException\n" +
+                 "See Also:" +
+                 "\n" +
+                 "" +
+                 "C1.setUndecorated(boolean)\n" +
+                 ""},
+        { "serialized-form.html",
+                 "Deprecated." +
+                 " As of JDK version 1.5, replaced by\n" +
                  " " +
-                 "setUndecorated(boolean)." + NL +
+                 "setUndecorated(boolean).\n" +
                  "This field indicates whether the C1 " +
-                 "is undecorated." + NL + " " + NL +
-                 "" + NL + "Since:" + NL +
-                 "1.4
" + NL + "See Also:" +
-                 "
" + NL + "" +
-                 "C1.setUndecorated(boolean)
" + NL + ""},
-        {BUG_ID + FS + "serialized-form.html", "Deprecated." +
-                 " As of JDK version 1.5, replaced by" + NL +
+                 "is undecorated.\n" +
+                 " \n" +
+                 "\n" +
+                 "Since:\n" +
+                 "1.4\n" +
+                 "See Also:" +
+                 "\n" +
+                 "" +
+                 "C1.setUndecorated(boolean)\n" +
+                 ""},
+        { "serialized-form.html",
+                 "Deprecated." +
+                 " As of JDK version 1.5, replaced by\n" +
                  " " +
-                 "setUndecorated(boolean)." + NL +
-                 "Reads the object stream." + NL +
-                 "" + NL + "Throws:
" + NL + "" +
-                 "IOException" + NL +
-                 "java.io.IOException
" + NL + ""},
-        {BUG_ID + FS + "serialized-form.html", "Deprecated." +
-                 " " + NL + "" +
+                 "setUndecorated(boolean).\n" +
+                 "Reads the object stream.\n" +
+                 "\n" +
+                 "Throws:\n" +
+                 "" +
+                 "IOException\n" +
+                 "java.io.IOException\n" +
+                 ""},
+        { "serialized-form.html",
+                 "Deprecated." +
+                 " \n" +
+                 "" +
                  "The name for this class."}};
 
     // Test with -nocomment option. The serialized-form.html should
     // not display the inline comments and tags but should display deprecation
     // information if any.
     private static final String[][] TEST_NOCMNT = {
-        {BUG_ID + FS + "serialized-form.html", "boolean undecorated" + NL +
+        { "serialized-form.html",
+                 "boolean undecorated\n" +
                  "Deprecated. " +
-                 "As of JDK version 1.5, replaced by" + NL +
+                 "As of JDK version 1.5, replaced by\n" +
                  " " +
-                 "setUndecorated(boolean)." + NL + ""},
-        {BUG_ID + FS + "serialized-form.html", "" +
+                 "setUndecorated(boolean).\n" +
+                 ""},
+        { "serialized-form.html",
+                 "" +
                  "Deprecated. As of JDK version" +
-                 " 1.5, replaced by" + NL +
+                 " 1.5, replaced by\n" +
                  " " +
-                 "setUndecorated(boolean)." + NL + ""}};
+                 "setUndecorated(boolean).\n" +
+                 ""}};
 
     // Test with -nodeprecated option. The serialized-form.html should
     // ignore the -nodeprecated tag and display the deprecation info. This
@@ -97,19 +115,20 @@
 
     private static final String[] ARGS1 =
         new String[] {
-            "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
+            "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"};
 
     private static final String[] ARGS2 =
         new String[] {
-            "-d", BUG_ID, "-nocomment", "-sourcepath", SRC_DIR, "pkg1"};
+            "-d", OUTPUT_DIR, "-nocomment", "-sourcepath", SRC_DIR, "pkg1"};
 
     private static final String[] ARGS3 =
         new String[] {
-            "-d", BUG_ID, "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
+            "-d", OUTPUT_DIR, "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
 
     private static final String[] ARGS4 =
         new String[] {
-            "-d", BUG_ID, "-nocomment", "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
+            "-d", OUTPUT_DIR, "-nocomment", "-nodeprecated", "-sourcepath",
+            SRC_DIR, "pkg1"};
 
     /**
      * The entry point of the test.
@@ -117,25 +136,10 @@
      */
     public static void main(String[] args) {
         TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo();
-        tester.exactNewlineMatch = false;
-        run(tester, ARGS1, TEST_CMNT_DEPR, TEST_NOCMNT);
-        run(tester, ARGS2, TEST_NOCMNT, TEST_CMNT_DEPR);
-        run(tester, ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR);
-        run(tester, ARGS4, TEST_NOCMNT_NODEPR, TEST_NODEPR);
+        tester.run(ARGS1, TEST_CMNT_DEPR, TEST_NOCMNT);
+        tester.run(ARGS2, TEST_NOCMNT, TEST_CMNT_DEPR);
+        tester.run(ARGS3, TEST_NODEPR, TEST_NOCMNT_NODEPR);
+        tester.run(ARGS4, TEST_NOCMNT_NODEPR, TEST_NODEPR);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -37,27 +37,25 @@
 
 public class TestSimpleTag extends JavadocTester {
 
-    private static final String BUG_ID = "4695326-4750173-4920381";
-
     private static final String[][] TEST =
         new String[][] {
-            {"./" + BUG_ID + "/C.html",
+            { "C.html",
                 "Todo:"},
-            {"./" + BUG_ID + "/C.html",
+            { "C.html",
                 "EJB Beans:"},
-            {"./" + BUG_ID + "/C.html",
+            { "C.html",
                 "Regular Tag:"},
-            {"./" + BUG_ID + "/C.html",
+            { "C.html",
                 "Back-Slash-Tag:"},
         };
 
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR,
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
         "-tag", "todo",
         "-tag", "ejb\\:bean:a:EJB Beans:",
         "-tag", "regular:a:Regular Tag:",
         "-tag", "back-slash\\:tag\\\\:a:Back-Slash-Tag:",
-        SRC_DIR + FS + "C.java"
+        SRC_DIR + "/C.java"
     };
 
     /**
@@ -66,21 +64,7 @@
      */
     public static void main(String[] args) {
         TestSimpleTag tester = new TestSimpleTag();
-        run(tester, ARGS, TEST, NO_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java
--- a/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,14 +35,12 @@
 
 public class TestSimpleTagExclude extends JavadocTester {
 
-    private static final String BUG_ID = "4628181";
-    private static final String[][] TEST = NO_TEST;
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "DummyClass.html", "todo"}
+        { "DummyClass.html", "todo"}
     };
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-tag", "todo:X",
-        SRC_DIR + FS + "DummyClass.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-tag", "todo:X",
+        SRC_DIR + "/DummyClass.java"
     };
 
     /**
@@ -51,23 +49,9 @@
      */
     public static void main(String[] args) {
         TestSimpleTagExclude tester = new TestSimpleTagExclude();
-        if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) {
+        if (tester.run(ARGS, NO_TEST, NEGATED_TEST) != 0) {
             throw new Error("Javadoc failed to execute.");
         }
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java
--- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -32,10 +32,6 @@
 
 public class TestSimpleTagInherit extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "8008768";
-    private static final String OUTPUT_DIR = BUG_ID;
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
         "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
@@ -45,14 +41,13 @@
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        { BUG_ID + FS + "p" + FS + "TestClass.html",
-          "Custom:" + NL +
+        { "p/TestClass.html",
+          "Custom:\n" +
           "doc for BaseClass class" },
-        { BUG_ID + FS + "p" + FS + "TestClass.html",
-          "Custom:" + NL +
+        { "p/TestClass.html",
+          "Custom:\n" +
           "doc for BaseClass method" }
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -60,21 +55,7 @@
      */
     public static void main(String[] args) {
         TestSimpleTagInherit tester = new TestSimpleTagInherit();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java
--- a/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, 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
@@ -33,26 +33,25 @@
 
 public class TestSinceTag extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "7180906";
-
     //Javadoc arguments.
     private static final String[] ARGS1 = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"
     };
 
     private static final String[] ARGS2 = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-nosince", "pkg1"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-nosince", "pkg1"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "C1.html",
-            "" + NL + "Since:" + NL +
+        { "pkg1/C1.html",
+            "\n" +
+            "Since:\n" +
             "JDK1.0"
         },
-        {BUG_ID + FS + "serialized-form.html",
-            "" + NL + "Since:" + NL +
+        { "serialized-form.html",
+            "\n" +
+            "Since:\n" +
             "1.4"
         }
     };
@@ -63,22 +62,8 @@
      */
     public static void main(String[] args) {
         TestSinceTag tester = new TestSinceTag();
-        run(tester, ARGS1, TEST, NO_TEST);
-        run(tester, ARGS2, NO_TEST, TEST);
+        tester.run(ARGS1, TEST, NO_TEST);
+        tester.run(ARGS2, NO_TEST, TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java	Tue Apr 29 14:40:07 2014 -0700
@@ -32,21 +32,20 @@
  */
 public class TestSingleQuotedLink extends JavadocTester {
 
-    private static final String BUG_ID = "6457406";
     // We are testing the redirection algorithm with a known scenario when a writer is not forced to ignore it: "-use".
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
+        { "pkg1/class-use/C1.html",
             ""
         }
     };
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
+        { "pkg1/class-use/C1.html",
             "pkg1/\'http://download.oracle.com/javase/8/docs/technotes/guides/indexC2.html\'>"
         }
     };
     private static final String[] ARGS =
             new String[]{
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1"
     };
 
     /**
@@ -55,21 +54,7 @@
      */
     public static void main(String[] args) {
         TestSingleQuotedLink tester = new TestSingleQuotedLink();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java
--- a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -37,18 +37,15 @@
 
 public class TestSourceTab extends JavadocTester {
 
-    private static final String BUG_ID = "4510979";
     private static final String TMP_SRC_DIR = "tmpSrc";
-    private static final String OUTPUT_DIR1 = BUG_ID + "-tabLengthEight";
-    private static final String OUTPUT_DIR2 = BUG_ID + "-tabLengthFour";
-    private static final String[][] TEST = NO_TEST;
-    private static final String[][] NEGATED_TEST = NO_TEST;
+    private static final String OUTPUT_DIR1 = OUTPUT_DIR + "-tabLengthEight";
+    private static final String OUTPUT_DIR2 = OUTPUT_DIR + "-tabLengthFour";
 
     //Run Javadoc on a source file with that is indented with a single tab per line
     private static final String[] ARGS1 =
         new String[] {
             "-d", OUTPUT_DIR1, "-sourcepath", TMP_SRC_DIR,
-            "-notimestamp", "-linksource", TMP_SRC_DIR + FS + "SingleTab" + FS + "C.java"
+            "-notimestamp", "-linksource", TMP_SRC_DIR + "/SingleTab/C.java"
         };
 
     //Run Javadoc on a source file with that is indented with a two tab per line
@@ -57,18 +54,13 @@
     private static final String[] ARGS2 =
         new String[] {
             "-d", OUTPUT_DIR2, "-sourcepath", TMP_SRC_DIR,
-            "-notimestamp", "-sourcetab", "4", TMP_SRC_DIR + FS + "DoubleTab" + FS + "C.java"
+            "-notimestamp", "-sourcetab", "4", TMP_SRC_DIR + "/DoubleTab/C.java"
         };
 
     //Files to diff
-    private static final String[][] FILES_TO_DIFF = {
-        {OUTPUT_DIR1 + FS + "src-html" + FS + "C.html",
-         OUTPUT_DIR2 + FS + "src-html" + FS + "C.html"
-        },
-        {OUTPUT_DIR1 + FS + "C.html",
-         OUTPUT_DIR2 + FS + "C.html"
-        }
-
+    private static final String[] FILES_TO_DIFF = {
+        "src-html/C.html",
+        "C.html"
     };
 
     /**
@@ -77,9 +69,9 @@
      */
     public static void main(String[] args) throws IOException {
         TestSourceTab tester = new TestSourceTab();
-        run(tester, ARGS1, TEST, NEGATED_TEST);
-        run(tester, ARGS2, TEST, NEGATED_TEST);
-        tester.runDiffs(FILES_TO_DIFF);
+        tester.run(ARGS1, NO_TEST, NO_TEST);
+        tester.run(ARGS2, NO_TEST, NO_TEST);
+        tester.runDiffs(OUTPUT_DIR1, OUTPUT_DIR2, FILES_TO_DIFF);
     }
 
     TestSourceTab() throws IOException {
@@ -121,18 +113,4 @@
             out.close();
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -33,105 +33,116 @@
 
 public class TestStylesheet extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4494033-7028815-7052425-8007338";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "stylesheet.css",
+        { "stylesheet.css",
             "/* Javadoc style sheet */"},
-        {BUG_ID + FS + "stylesheet.css",
-            "/*" + NL + "Overall document style" + NL + "*/"},
-        {BUG_ID + FS + "stylesheet.css",
-            "/*" + NL + "Heading styles" + NL + "*/"},
-        {BUG_ID + FS + "stylesheet.css",
-            "/*" + NL + "Navigation bar styles" + NL + "*/"},
-        {BUG_ID + FS + "stylesheet.css",
-            "body {" + NL + "    background-color:#ffffff;" + NL +
-            "    color:#353833;" + NL +
-            "    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;" + NL +
-            "    font-size:14px;" + NL + "    margin:0;" + NL + "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            "ul {" + NL + "    list-style-type:disc;" + NL + "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            ".overviewSummary caption, .memberSummary caption, .typeSummary caption," + NL +
-            ".useSummary caption, .constantsSummary caption, .deprecatedSummary caption {" + NL +
-            "    position:relative;" + NL +
-            "    text-align:left;" + NL +
-            "    background-repeat:no-repeat;" + NL +
-            "    color:#253441;" + NL +
-            "    font-weight:bold;" + NL +
-            "    clear:none;" + NL +
-            "    overflow:hidden;" + NL +
-            "    padding:0px;" + NL +
-            "    padding-top:10px;" + NL +
-            "    padding-left:1px;" + NL +
-            "    margin:0px;" + NL +
-            "    white-space:pre;" + NL +
+        { "stylesheet.css",
+            "/*\n" +
+            "Overall document style\n" +
+            "*/"},
+        { "stylesheet.css",
+            "/*\n" +
+            "Heading styles\n" +
+            "*/"},
+        { "stylesheet.css",
+            "/*\n" +
+            "Navigation bar styles\n" +
+            "*/"},
+        { "stylesheet.css",
+            "body {\n" +
+            "    background-color:#ffffff;\n" +
+            "    color:#353833;\n" +
+            "    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;\n" +
+            "    font-size:14px;\n" +
+            "    margin:0;\n" +
+            "}"},
+        { "stylesheet.css",
+            "ul {\n" +
+            "    list-style-type:disc;\n" +
+            "}"},
+        { "stylesheet.css",
+            ".overviewSummary caption, .memberSummary caption, .typeSummary caption,\n" +
+            ".useSummary caption, .constantsSummary caption, .deprecatedSummary caption {\n" +
+            "    position:relative;\n" +
+            "    text-align:left;\n" +
+            "    background-repeat:no-repeat;\n" +
+            "    color:#253441;\n" +
+            "    font-weight:bold;\n" +
+            "    clear:none;\n" +
+            "    overflow:hidden;\n" +
+            "    padding:0px;\n" +
+            "    padding-top:10px;\n" +
+            "    padding-left:1px;\n" +
+            "    margin:0px;\n" +
+            "    white-space:pre;\n" +
             "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span," + NL +
-            ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {" + NL +
-            "    white-space:nowrap;" + NL +
-            "    padding-top:5px;" + NL +
-            "    padding-left:12px;" + NL +
-            "    padding-right:12px;" + NL +
-            "    padding-bottom:7px;" + NL +
-            "    display:inline-block;" + NL +
-            "    float:left;" + NL +
-            "    background-color:#F8981D;" + NL +
-            "    border: none;" + NL +
-            "    height:16px;" + NL +
+        { "stylesheet.css",
+            ".overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,\n" +
+            ".useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {\n" +
+            "    white-space:nowrap;\n" +
+            "    padding-top:5px;\n" +
+            "    padding-left:12px;\n" +
+            "    padding-right:12px;\n" +
+            "    padding-bottom:7px;\n" +
+            "    display:inline-block;\n" +
+            "    float:left;\n" +
+            "    background-color:#F8981D;\n" +
+            "    border: none;\n" +
+            "    height:16px;\n" +
             "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            ".memberSummary caption span.activeTableTab span {" + NL +
-            "    white-space:nowrap;" + NL +
-            "    padding-top:5px;" + NL +
-            "    padding-left:12px;" + NL +
-            "    padding-right:12px;" + NL +
-            "    margin-right:3px;" + NL +
-            "    display:inline-block;" + NL +
-            "    float:left;" + NL +
-            "    background-color:#F8981D;" + NL +
-            "    height:16px;" + NL +
+        { "stylesheet.css",
+            ".memberSummary caption span.activeTableTab span {\n" +
+            "    white-space:nowrap;\n" +
+            "    padding-top:5px;\n" +
+            "    padding-left:12px;\n" +
+            "    padding-right:12px;\n" +
+            "    margin-right:3px;\n" +
+            "    display:inline-block;\n" +
+            "    float:left;\n" +
+            "    background-color:#F8981D;\n" +
+            "    height:16px;\n" +
             "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            ".memberSummary caption span.tableTab span {" + NL +
-            "    white-space:nowrap;" + NL +
-            "    padding-top:5px;" + NL +
-            "    padding-left:12px;" + NL +
-            "    padding-right:12px;" + NL +
-            "    margin-right:3px;" + NL +
-            "    display:inline-block;" + NL +
-            "    float:left;" + NL +
-            "    background-color:#4D7A97;" + NL +
-            "    height:16px;" + NL +
+        { "stylesheet.css",
+            ".memberSummary caption span.tableTab span {\n" +
+            "    white-space:nowrap;\n" +
+            "    padding-top:5px;\n" +
+            "    padding-left:12px;\n" +
+            "    padding-right:12px;\n" +
+            "    margin-right:3px;\n" +
+            "    display:inline-block;\n" +
+            "    float:left;\n" +
+            "    background-color:#4D7A97;\n" +
+            "    height:16px;\n" +
             "}"},
-        {BUG_ID + FS + "stylesheet.css",
-            ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {" + NL +
-            "    padding-top:0px;" + NL +
-            "    padding-left:0px;" + NL +
-            "    padding-right:0px;" + NL +
-            "    background-image:none;" + NL +
-            "    float:none;" + NL +
-            "    display:inline;" + NL +
+        { "stylesheet.css",
+            ".memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {\n" +
+            "    padding-top:0px;\n" +
+            "    padding-left:0px;\n" +
+            "    padding-right:0px;\n" +
+            "    background-image:none;\n" +
+            "    float:none;\n" +
+            "    display:inline;\n" +
             "}"},
-        {BUG_ID + FS + "stylesheet.css",
+        { "stylesheet.css",
             "@import url('resources/fonts/dejavu.css');"},
         // Test whether a link to the stylesheet file is inserted properly
         // in the class documentation.
-        {BUG_ID + FS + "pkg" + FS + "A.html",
+        { "pkg/A.html",
             ""}
     };
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "stylesheet.css",
-            "* {" + NL + "    margin:0;" + NL + "    padding:0;" + NL + "}"}
+        { "stylesheet.css",
+            "* {\n" +
+            "    margin:0;\n" +
+            "    padding:0;\n" +
+            "}"}
     };
 
     /**
@@ -140,21 +151,7 @@
      */
     public static void main(String[] args) {
         TestStylesheet tester = new TestStylesheet();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java
--- a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -34,26 +34,27 @@
 
 public class TestSubTitle extends JavadocTester {
 
-    private static final String BUG_ID = "7010342";
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
+        { "pkg/package-summary.html",
             "This is the description of package pkg."
         },
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "pkg"
         }
     };
     private static final String[][] NEG_TEST = {
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
-            "" + NL + "
This is the " +
-            "description of package pkg.
" + NL + ""
+        { "pkg/package-summary.html",
+            "\n" +
+            "
This is the " +
+            "description of package pkg.\n" +
+            ""
         },
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "pkg"
         }
     };
     private static final String[] ARGS = new String[]{
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     /**
@@ -62,21 +63,7 @@
      */
     public static void main(String[] args) {
         TestSubTitle tester = new TestSubTitle();
-        run(tester, ARGS, TEST, NEG_TEST);
+        tester.run(ARGS, TEST, NEG_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -36,19 +36,15 @@
 
 public class TestSummaryHeading extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4904036";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "C.html",  "Method Summary"}
+        { "C.html",  "Method Summary"}
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -56,21 +52,7 @@
      */
     public static void main(String[] args) {
         TestSummaryHeading tester = new TestSummaryHeading();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,16 +35,13 @@
 
 public class TestSuperClassInSerialForm extends JavadocTester {
 
-    private static final String BUG_ID = "4671694";
-
     private static final String[][] TEST = {
-        {BUG_ID + FS + "serialized-form.html",
+        { "serialized-form.html",
          "pkg.SubClass extends SuperClass"}
     };
 
-    private static final String[][] NEGATED_TEST = NO_TEST;
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     /**
@@ -53,21 +50,7 @@
      */
     public static void main(String[] args) {
         TestSuperClassInSerialForm tester = new TestSuperClassInSerialForm();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java
--- a/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -37,7 +37,6 @@
 
 public class TestSupplementary extends JavadocTester {
 
-    private static final String BUG_ID = "4914724";
     private static final String[][] TEST = {
         {WARNING_OUTPUT, "C.java:38: warning - Tag @see:illegal character: \"119040\" in \"C#method\ud834\udd00()"},
         {WARNING_OUTPUT, "C.java:44: warning - illegal character \ud801 in @serialField tag: field\ud801\ud801 int."},
@@ -50,7 +49,7 @@
         {WARNING_OUTPUT, "C.java:31: warning - illegal character"},
     };
     private static final String[] ARGS = new String[] {
-        "-locale", "en_US", "-d", BUG_ID, SRC_DIR + FS + "C.java"
+        "-locale", "en_US", "-d", OUTPUT_DIR, SRC_DIR + "/C.java"
     };
 
     /**
@@ -61,24 +60,10 @@
         Locale saveLocale = Locale.getDefault();
         try {
             TestSupplementary tester = new TestSupplementary();
-            run(tester, ARGS, TEST, NEGATED_TEST);
+            tester.run(ARGS, TEST, NEGATED_TEST);
             tester.printSummary();
         } finally {
             Locale.setDefault(saveLocale);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java
--- a/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -21,8 +21,6 @@
  * questions.
  */
 
-import com.sun.javadoc.*;
-
 /*
  * @test
  * @bug 4706525
@@ -34,9 +32,10 @@
  * @run main TestTagHolderMethod
  */
 
+import com.sun.javadoc.*;
+
 public class TestTagHolderMethod extends JavadocTester {
 
-    private static final String BUG_ID = "4706525";
     public static final String[] ARGS = new String[] {
         "-docletpath", SRC_DIR, "-doclet", "TestTagHolderMethod", "-sourcepath",
                 SRC_DIR, "pkg"};
@@ -74,20 +73,7 @@
      * @param args the array of command line arguments.
      */
     public static void main(String[] args) {
-        run(new TestTagHolderMethod(), ARGS, new String[][]{}, new String[][]{});
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
+        JavadocTester tester = new TestTagHolderMethod();
+        tester.run(ARGS, new String[][]{}, new String[][]{});
     }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -34,9 +34,9 @@
 
 public class TestTagInheritence extends JavadocTester {
 
-    private static final String BUG_ID = "4496223-4496270-4618686-4720974-4812240-6253614-6253604";
     private static final String[] ARGS = new String[] {
-        "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
+        "-Xdoclint:none", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg",
+        "firstSentence", "firstSentence2"
     };
 
     /**
@@ -52,36 +52,20 @@
 
         //Test valid usage of inheritDoc tag.
         for (int i = 1; i < tests.length-2; i++) {
-            tests[i][0] = BUG_ID + FS + "pkg" + FS + "TestTagInheritence.html";
+            tests[i][0] = "pkg/TestTagInheritence.html";
             tests[i][1] = "Test " + i + " passes";
         }
 
         //First sentence test (6253614)
-        tests[tests.length - 2][0] =BUG_ID + FS + "firstSentence" + FS +
-            "B.html";
+        tests[tests.length - 2][0] = "firstSentence/B.html";
         tests[tests.length - 2][1] =  "First sentence.";
 
         //Another first sentence test (6253604)
-        tests[tests.length - 1][0] =BUG_ID + FS + "firstSentence2" + FS +
-            "C.html";
+        tests[tests.length - 1][0] = "firstSentence2/C.html";
         tests[tests.length - 1][1] =  "First sentence.";
 
         TestTagInheritence tester = new TestTagInheritence();
-        run(tester, ARGS, tests, NO_TEST);
+        tester.run(ARGS, tests, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java
--- a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2014, 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
@@ -32,16 +32,14 @@
  */
 public class TestTagMisuse extends JavadocTester {
 
-    private static final String BUG_ID = "no-bug-id";
     private static final String[][] TEST = {
         {WARNING_OUTPUT, "warning - Tag @param cannot be used in field documentation."},
         {WARNING_OUTPUT, "warning - Tag @throws cannot be used in field documentation."},
         {WARNING_OUTPUT, "warning - Tag @return cannot be used in constructor documentation."},
         {WARNING_OUTPUT, "warning - Tag @throws cannot be used in inline documentation."},
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
     private static final String[] ARGS = new String[] {
-        "-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "TestTagMisuse.java"
+        "-Xdoclint:none", "-d", OUTPUT_DIR, SRC_DIR + "/TestTagMisuse.java"
     };
 
     /**
@@ -50,25 +48,11 @@
      */
     public static void main(String[] args) {
         TestTagMisuse tester = new TestTagMisuse();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
 
     /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
-
-    /**
      * {@throws blah}
      * Here is a bad field tag:
      * @throws foo
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java
--- a/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -35,22 +35,21 @@
 
 public class TestTagOutput extends JavadocTester {
 
-    private static final String BUG_ID = "8026370";
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html",
+        { "pkg1/DeprecatedTag.html",
             "Deprecated. "},
-        {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html",
+        { "pkg1/DeprecatedTag.html",
             "Deprecated. " +
             "Do not use this."}};
 
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg1" + FS + "DeprecatedTag.html",
+        { "pkg1/DeprecatedTag.html",
             "Deprecated." +
             " "}};
 
     private static final String[] ARGS =
         new String[] {
-            "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
+            "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"};
 
     /**
      * The entry point of the test.
@@ -58,21 +57,7 @@
      */
     public static void main(String[] args) {
         TestTagOutput tester = new TestTagOutput();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -38,34 +38,28 @@
 
 public class TestTaglets extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4654308-4767038";
-    private static final String OUTPUT_DIR = BUG_ID;
-
     //Javadoc arguments.
     private static final String[] ARGS_4654308 = new String[] {
         "-d", "4654308", "-tagletpath", SRC_DIR, "-taglet", "taglets.Foo",
-        "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java"
+        "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
     };
 
     private static final String[] ARGS_4767038 = new String[] {
-        "-d", "4767038", "-sourcepath", SRC_DIR, SRC_DIR + FS + "Parent.java",
-        SRC_DIR + FS + "Child.java"
+        "-d", "4767038", "-sourcepath", SRC_DIR, SRC_DIR + "/Parent.java",
+        SRC_DIR + "/Child.java"
     };
 
     //Input for string search tests.
     private static final String[][] TEST_4654308 = new String[][] {
-        {"4654308" + FS + "C.html", "Foo:" +
+        { "C.html", "Foo:" +
                  "my only method is here" +
                  ""}
     };
-    private static final String[][] NEGATED_TEST_4654308 = NO_TEST;
 
     private static final String[][] TEST_4767038 = new String[][] {
-        {"4767038" + FS + "Child.html",
+        { "Child.html",
             "This is the first sentence."}
     };
-    private static final String[][] NEGATED_TEST_4767038 = NO_TEST;
 
 
     /**
@@ -74,24 +68,10 @@
      */
     public static void main(String[] args) {
         TestTaglets tester = new TestTaglets();
-        run(tester, ARGS_4654308, TEST_4654308, NEGATED_TEST_4654308);
+        tester.run(ARGS_4654308, TEST_4654308, NO_TEST);
         tester.printSummary();
         tester = new TestTaglets();
-        run(tester, ARGS_4767038, TEST_4767038, NEGATED_TEST_4767038);
+        tester.run(ARGS_4767038, TEST_4767038, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -21,7 +21,7 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 4530727 8026567
  * @summary When an exception is declared in the method signature but
@@ -36,13 +36,11 @@
 
 public class TestThrowsHead extends JavadocTester {
 
-    private static final String BUG_ID = "4530727";
     private static final String[][] TEST = {
-        {BUG_ID + FS + "C.html", "Throws:"}
+        { "C.html", "
Throws:"}
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, SRC_DIR + FS + "C.java"
+        "-d", OUTPUT_DIR, SRC_DIR + "/C.java"
     };
 
     /**
@@ -51,21 +49,7 @@
      */
     public static void main(String[] args) {
         TestThrowsHead tester = new TestThrowsHead();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -36,20 +36,19 @@
 
 public class TestThrowsTagInheritence extends JavadocTester {
 
-    private static final String BUG_ID = "4684827-4633969";
     private static final String[][] TEST = {
         //The class should not inherit the tag from the interface.
-        {BUG_ID + FS + "Foo.html", "Test 1 passes."}
+        { "Foo.html", "Test 1 passes."}
     };
     private static final String[][] NEGATED_TEST = {
         //The class should not inherit the tag from the interface.
-        {BUG_ID + FS + "C.html", "Test 1 fails."}
+        { "C.html", "Test 1 fails."}
 
     };
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java",
-        SRC_DIR + FS + "I.java", SRC_DIR + FS + "Foo.java",
-        SRC_DIR + FS + "Iface.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java",
+        SRC_DIR + "/I.java", SRC_DIR + "/Foo.java",
+        SRC_DIR + "/Iface.java"
     };
 
     /**
@@ -58,21 +57,7 @@
      */
     public static void main(String[] args) {
         TestThrowsTagInheritence tester = new TestThrowsTagInheritence();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java
--- a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2014, 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
@@ -35,28 +35,24 @@
 
 public class TestThrowsTag extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4985072";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "C.html",
-            "
T1 - the first throws tag." + NL +
-            "T2 - the second throws tag." + NL +
-            "T3 - the third throws tag." + NL +
-            "T4 - the fourth throws tag." + NL +
-            "T5 - the first inherited throws tag." + NL +
-            "T6 - the second inherited throws tag." + NL +
-            "T7 - the third inherited throws tag." + NL +
+        { "pkg/C.html",
+            "T1 - the first throws tag.\n" +
+            "T2 - the second throws tag.\n" +
+            "T3 - the third throws tag.\n" +
+            "T4 - the fourth throws tag.\n" +
+            "T5 - the first inherited throws tag.\n" +
+            "T6 - the second inherited throws tag.\n" +
+            "T7 - the third inherited throws tag.\n" +
             "T8 - the fourth inherited throws tag."
         },
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -64,21 +60,7 @@
      */
     public static void main(String[] args) {
         TestThrowsTag tester = new TestThrowsTag();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java
--- a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -34,23 +34,23 @@
 
 public class TestTitleInHref extends JavadocTester {
 
-    private static final String BUG_ID = "4714257";
-
     private static final String[][] TEST = {
         //Test to make sure that the title shows up in a class link.
-        {BUG_ID + FS + "pkg" + FS + "Links.html", ""},
+        { "pkg/Links.html",
+            ""},
 
         //Test to make sure that the title shows up in an interface link.
-        {BUG_ID + FS + "pkg" + FS + "Links.html", ""},
+        { "pkg/Links.html",
+            ""},
 
         //Test to make sure that the title shows up in cross link shows up
-        {BUG_ID + FS + "pkg" + FS + "Links.html", "This is a cross link to class File"},
+        { "pkg/Links.html",
+            "This is a cross link to class File"},
 
     };
 
-    private static final String[][] NEGATED_TEST = NO_TEST;
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR,
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
         "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api",
         SRC_DIR, "pkg"
     };
@@ -61,21 +61,7 @@
      */
     public static void main(String[] args) {
         TestTitleInHref tester = new TestTitleInHref();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java
--- a/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, 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
@@ -34,42 +34,39 @@
 
 public class TestTopOption extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "6227616";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-overview", "SRC_DIR + FS + overview.html", "-use", "-top", "TOP TEXT", "-d", BUG_ID, "-sourcepath",
+        "-overview", "SRC_DIR + '/' + overview.html", "-use", "-top",
+        "TOP TEXT", "-d", OUTPUT_DIR, "-sourcepath",
         SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
+        { "pkg/AnnotationType.html",
             "TOP TEXT"},
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
+        { "pkg/class-use/AnnotationType.html",
             "TOP TEXT"},
 
-        {BUG_ID + FS + "pkg" + FS + "Cl.html",
+        { "pkg/Cl.html",
             "TOP TEXT"},
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "Cl.html",
+        { "pkg/class-use/Cl.html",
             "TOP TEXT"},
 
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
+        { "pkg/package-summary.html",
             "TOP TEXT"},
-        {BUG_ID + FS + "pkg" + FS + "package-use.html",
+        { "pkg/package-use.html",
            "TOP TEXT"},
 
-        {BUG_ID + FS + "overview-summary.html",
+        { "overview-summary.html",
             "TOP TEXT"},
-        {BUG_ID + FS + "overview-tree.html",
+        { "overview-tree.html",
             "TOP TEXT"},
-        {BUG_ID + FS + "constant-values.html",
+        { "constant-values.html",
             "TOP TEXT"},
-        {BUG_ID + FS + "help-doc.html",
+        { "help-doc.html",
             "TOP TEXT"},
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -77,21 +74,7 @@
      */
     public static void main(String[] args) {
         TestTopOption tester = new TestTopOption();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -34,26 +34,22 @@
 
 public class TestTypeAnnotations extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "8005091-8009686";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-private", "typeannos"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-private", "typeannos"
     };
 
     //Input for string search tests.
-    private static final String[][] NEGATED_TEST = NO_TEST;
     private static final String[][] TEST = {
         // Test for type annotations on Class Extends (ClassExtends.java).
-        {BUG_ID + FS + "typeannos" + FS + "MyClass.html",
+        { "typeannos/MyClass.html",
             "extends @ClassExtA ParameterizedClass<" +
             "@ClassExtB java.lang.String>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "MyClass.html",
+        { "typeannos/MyClass.html",
             "implements @ClassExtB java.lang.CharSequence, " +
             "@ClassExtB java.lang.String>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "MyInterface.html",
+        { "typeannos/MyInterface.html",
             "extends @ClassExtA " +
@@ -73,12 +69,12 @@
         },
 
         // Test for type annotations on Class Parameters (ClassParameters.java).
-        {BUG_ID + FS + "typeannos" + FS + "ExtendsBound.html",
+        { "typeannos/ExtendsBound.html",
             "class ExtendsBound<K extends @ClassParamA java.lang.String>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ExtendsGeneric.html",
+        { "typeannos/ExtendsGeneric.html",
             "class ExtendsGeneric<K extends " +
             "@ClassParamA " +
             "@ClassParamB java.lang.String>>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "TwoBounds.html",
+        { "typeannos/TwoBounds.html",
             "class TwoBounds<K extends " +
             "@ClassParamA java.lang.String,V extends @ClassParamB" +
             " java.lang.String>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "Complex1.html",
+        { "typeannos/Complex1.html",
             "class Complex1<K extends " +
             "@ClassParamA java.lang.String & java.lang.Runnable>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "Complex2.html",
+        { "typeannos/Complex2.html",
             "class Complex2<K extends java.lang." +
             "String & @ClassParamB java.lang.Runnable>"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ComplexBoth.html",
+        { "typeannos/ComplexBoth.html",
             "class ComplexBoth<K extends @ClassParamA java.lang.String & Parameterized<@FldA java.lang.String," +
             "@FldB java.lang.String> bothTypeArgs"
         },
-        {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html",
+        { "typeannos/DefaultScope.html",
             "@FldA java.lang.String @FldB [] " +
             "array1Deep"
         },
-        {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html",
+        { "typeannos/DefaultScope.html",
             "java.lang.String[] @FldB [] array2SecondOld"
         },
-        {BUG_ID + FS + "typeannos" + FS + "DefaultScope.html",
+        { "typeannos/DefaultScope.html",
             "@FldD java.lang.String @FldC @FldC @FldB [] array2Deep"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ModifiedScoped.html",
+        { "typeannos/ModifiedScoped.html",
             "public final Parameterized<@FldA " +
@@ -150,30 +146,30 @@
             "title=\"annotation in typeannos\">@FldB java.lang.String> " +
             "nestedParameterized"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ModifiedScoped.html",
+        { "typeannos/ModifiedScoped.html",
             "public final @FldA java.lang.String[][] " +
             "array2"
         },
 
         // Test for type annotations on method return types (MethodReturnType.java).
-        {BUG_ID + FS + "typeannos" + FS + "MtdDefaultScope.html",
+        { "typeannos/MtdDefaultScope.html",
             "public <T> @MRtnA java.lang.String" +
             " method()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "MtdDefaultScope.html",
+        { "typeannos/MtdDefaultScope.html",
             "@MRtnA java.lang.String @MRtnA [] " +
             "@MRtnB [] array2Deep()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "MtdDefaultScope.html",
+        { "typeannos/MtdDefaultScope.html",
             "@MRtnA java.lang.String[][] array2()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "MtdModifiedScoped.html",
+        { "typeannos/MtdModifiedScoped.html",
             "public final MtdParameterized<@MRtnA " +
@@ -187,12 +183,12 @@
         },
 
         // Test for type annotations on method type parameters (MethodTypeParameters.java).
-        {BUG_ID + FS + "typeannos" + FS + "UnscopedUnmodified.html",
+        { "typeannos/UnscopedUnmodified.html",
             "<K extends @MTyParamA java.lang.String>" +
             " void methodExtends()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "UnscopedUnmodified.html",
+        { "typeannos/UnscopedUnmodified.html",
             "<K extends @MTyParamA " +
@@ -200,12 +196,12 @@
             "title=\"annotation in typeannos\">@MTyParamB java.lang.String" +
             ">> void nestedExtends()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "PublicModifiedMethods.html",
+        { "typeannos/PublicModifiedMethods.html",
             "public final <K extends @MTyParamA " +
             "java.lang.String> void methodExtends()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "PublicModifiedMethods.html",
+        { "typeannos/PublicModifiedMethods.html",
             "public final <K extends @MTyParamA " +
             "java.lang.String,V extends void unannotated(" +
             "ParaParameterized<java.lang.String,java.lang.String>" +
             " a)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "Parameters.html",
+        { "typeannos/Parameters.html",
             "void nestedParaParameterized(" +
             "ParaParameterized<@ParamB" +
             " java.lang.String> a)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "Parameters.html",
+        { "typeannos/Parameters.html",
             "void array2Deep(@ParamA java.lang.String " +
             "void oneException()" + NL +
+        { "typeannos/ThrDefaultUnmodified.html",
+            "void oneException()\n" +
             "           throws @ThrA java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ThrDefaultUnmodified.html",
-            "void twoExceptions()" + NL +
+        { "typeannos/ThrDefaultUnmodified.html",
+            "void twoExceptions()\n" +
             "            throws @ThrA java.lang.RuntimeException," + NL +
+            "annotation in typeannos\">@ThrA java.lang.RuntimeException,\n" +
             "                   @ThrA java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ThrPublicModified.html",
-            "public final void oneException(java.lang.String a)" + NL +
+        { "typeannos/ThrPublicModified.html",
+            "public final void oneException(java.lang.String a)\n" +
             "                        throws @ThrA java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ThrPublicModified.html",
-            "public final void twoExceptions(java.lang.String a)" + NL +
+        { "typeannos/ThrPublicModified.html",
+            "public final void twoExceptions(java.lang.String a)\n" +
             "                         throws @ThrA java.lang.RuntimeException," + NL +
+            "title=\"annotation in typeannos\">@ThrA java.lang.RuntimeException,\n" +
             "                                @ThrA java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ThrWithValue.html",
-            "void oneException()" + NL +
+        { "typeannos/ThrWithValue.html",
+            "void oneException()\n" +
             "           throws @ThrB(value=\"m\") java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "ThrWithValue.html",
-            "void twoExceptions()" + NL +
+        { "typeannos/ThrWithValue.html",
+            "void twoExceptions()\n" +
             "            throws @ThrB(value=\"m\") java.lang.RuntimeException," + NL +
+            "ThrB.html#value--\">value=\"m\") java.lang.RuntimeException,\n" +
             "                   @ThrA java.lang.Exception"
         },
 
         // Test for type annotations on type parameters (TypeParameters.java).
-        {BUG_ID + FS + "typeannos" + FS + "TestMethods.html",
+        { "typeannos/TestMethods.html",
             "<K,V extends @TyParaA java.lang.String> " +
             "void secondAnnotated()"
         },
 
         // Test for type annotations on wildcard type (Wildcards.java).
-        {BUG_ID + FS + "typeannos" + FS + "BoundTest.html",
+        { "typeannos/BoundTest.html",
             "void wcExtends(MyList<? extends @WldA" +
             " java.lang.String> l)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "BoundTest.html",
+        { "typeannos/BoundTest.html",
             "MyList<? super @WldA java.lang.String>" +
             " returnWcSuper()"
         },
-        {BUG_ID + FS + "typeannos" + FS + "BoundWithValue.html",
+        { "typeannos/BoundWithValue.html",
             "void wcSuper(MyList<? super @WldB(value=\"m\") java.lang." +
             "String> l)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "BoundWithValue.html",
+        { "typeannos/BoundWithValue.html",
             "MyList<? extends @WldB(void withException(@RcvrA " +
-            "DefaultUnmodified this)" + NL + "            throws java." +
+            "DefaultUnmodified this)\n" +
+            "            throws java." +
             "lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html",
+        { "typeannos/DefaultUnmodified.html",
             "java.lang.String nonVoid(@RcvrA @RcvrB" +
             "(value=\"m\")" +
             " DefaultUnmodified this)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "DefaultUnmodified.html",
+        { "typeannos/DefaultUnmodified.html",
             "<T extends java.lang.Runnable> void accept(" +
             "@RcvrA DefaultUnmodified this," + NL +
-            "                                           T r)" + NL +
+            "typeannos\">@RcvrA DefaultUnmodified this,\n" +
+            "                                           T r)\n" +
             "                                    throws java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "PublicModified.html",
+        { "typeannos/PublicModified.html",
             "public final java.lang.String nonVoid(" +
             "@RcvrA PublicModified this)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "PublicModified.html",
+        { "typeannos/PublicModified.html",
             "public final <T extends java.lang.Runnable> " +
             "void accept(@RcvrA PublicModified this," + NL +
-            "                                                        T r)" + NL +
+            "annotation in typeannos\">@RcvrA PublicModified this,\n" +
+            "                                                        T r)\n" +
             "                                                 throws java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "WithValue.html",
+        { "typeannos/WithValue.html",
             "<T extends java.lang.Runnable> void accept(" +
             "@RcvrB(" +
-            "value=\"m\") WithValue this," + NL +
-            "                                           T r)" + NL +
+            "value=\"m\") WithValue this,\n" +
+            "                                           T r)\n" +
             "                                    throws java.lang.Exception"
         },
-        {BUG_ID + FS + "typeannos" + FS + "WithFinal.html",
+        { "typeannos/WithFinal.html",
             "java.lang.String nonVoid(@RcvrB(value=\"m\") WithFinal" +
             " this)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "WithBody.html",
+        { "typeannos/WithBody.html",
             "void field(@RcvrA WithBody this)"
         },
-        {BUG_ID + FS + "typeannos" + FS + "Generic2.html",
+        { "typeannos/Generic2.html",
             "void test2(@RcvrA Generic2<X> this)"
         }
@@ -382,21 +379,7 @@
      */
     public static void main(String[] args) {
         TestTypeAnnotations tester = new TestTypeAnnotations();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java
--- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -37,54 +37,50 @@
 
 public class TestTypeParameters extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4927167-4974929-7010344";
-
     //Javadoc arguments.
     private static final String[] ARGS1 = new String[]{
-        "-d", BUG_ID, "-use", "-sourcepath", SRC_DIR,
+        "-d", OUTPUT_DIR, "-use", "-sourcepath", SRC_DIR,
         "pkg"
     };
     private static final String[] ARGS2 = new String[]{
-        "-d", BUG_ID, "-linksource", "-sourcepath", SRC_DIR,
+        "-d", OUTPUT_DIR, "-linksource", "-sourcepath", SRC_DIR,
         "pkg"
     };
 
     //Input for string search tests.
     private static final String[][] TEST1 = {
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             ""
         },
-        {BUG_ID + FS + "pkg" + FS + "C.html",
+        { "pkg/C.html",
             "<T> java.lang.Object"
         },
-        {BUG_ID + FS + "pkg" + FS + "package-summary.html",
+        { "pkg/package-summary.html",
             "C<E extends Parent>"
         },
-        {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "Foo4.html",
+        { "pkg/class-use/Foo4.html",
             "" +
             "ClassUseTest3<T extends ParamTest2<java.util.List<? extends " +
             "Foo4>>>"
         },
         //Nested type parameters
-        {BUG_ID + FS + "pkg" + FS + "C.html",
-            "" + NL +
-            "" + NL +
+        { "pkg/C.html",
+            "\n" +
+            "\n" +
             ""
         },
     };
     private static final String[][] TEST2 = {
-        {BUG_ID + FS + "pkg" + FS + "ClassUseTest3.html",
+        { "pkg/ClassUseTest3.html",
             "public class " +
             "ClassUseTest3<T extends ParamTest2<java.util.List<? extends " +
             "Foo4>>>"
         }
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     /**
      * The entry point of the test.
@@ -92,22 +88,8 @@
      */
     public static void main(String[] args) {
         TestTypeParameters tester = new TestTypeParameters();
-        run(tester, ARGS1, TEST1, NEGATED_TEST);
-        run(tester, ARGS2, TEST2, NEGATED_TEST);
+        tester.run(ARGS1, TEST1, NO_TEST);
+        tester.run(ARGS2, TEST2, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -35,32 +35,29 @@
 
 public class TestUnnamedPackage extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4904075-4774450-5015144";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
     };
 
     //Input for string search tests.
     private static final String[][] TEST = {
-        {BUG_ID + FS + "package-summary.html",
+        { "package-summary.html",
             "Package <Unnamed>"
         },
-        {BUG_ID + FS + "package-summary.html",
+        { "package-summary.html",
             "This is a package comment for the unnamed package."
         },
-        {BUG_ID + FS + "package-summary.html",
+        { "package-summary.html",
             "This is a class in the unnamed package."
         },
-        {BUG_ID + FS + "package-tree.html",
+        { "package-tree.html",
             "Hierarchy For Package <Unnamed>"
         },
-        {BUG_ID + FS + "index-all.html",
+        { "index-all.html",
             "title=\"class in <Unnamed>\""
         },
-        {BUG_ID + FS + "C.html", ""}
+        { "C.html", ""}
     };
     private static final String[][] NEGATED_TEST = {
         {ERROR_OUTPUT, "BadSource"},
@@ -72,21 +69,7 @@
      */
     public static void main(String[] args) {
         TestUnnamedPackage tester = new TestUnnamedPackage();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java
--- a/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -34,8 +34,6 @@
 
 public class TestUseOption extends JavadocTester {
 
-    private static final String BUG_ID = "4496290-4985072-7006178-7068595";
-
     //Input for string search tests.
     private static final String[] TEST2 = {
         "Field in C1.",
@@ -55,36 +53,38 @@
     };
 
     private static final String[][] TEST3 = {
-        {BUG_ID + "-3" + FS + "class-use" + FS + "UsedInC.html", "Uses of " +
-                 "UsedInC in <Unnamed>"
+        { "class-use/UsedInC.html",
+            "Uses of " +
+            "UsedInC in <Unnamed>"
         },
-        {BUG_ID + "-3" + FS + "package-use.html", ""
+        { "package-use.html",
+            ""
         }
     };
 
     private static final String[][] TEST4 = {
-        {BUG_ID + "-4" + FS + "pkg2" + FS + "class-use" + FS + "C3.html", "" +
-                 "Frames"
+        { "pkg2/class-use/C3.html",
+            "" +
+            "Frames"
         }
     };
 
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
     };
 
     private static final String[] ARGS2 = new String[] {
-        "-d", BUG_ID+"-2", "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
+        "-d", OUTPUT_DIR+"-2", "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
     };
 
     private static final String[] ARGS3 = new String[] {
-        "-d", BUG_ID + "-3", "-sourcepath", SRC_DIR, "-use", SRC_DIR + FS + "C.java", SRC_DIR + FS + "UsedInC.java"
+        "-d", OUTPUT_DIR + "-3", "-sourcepath", SRC_DIR, "-use",
+        SRC_DIR + "/C.java", SRC_DIR + "/UsedInC.java"
     };
 
     private static final String[] ARGS4 = new String[] {
-        "-d", BUG_ID + "-4", "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
+        "-d", OUTPUT_DIR + "-4", "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
     };
 
     /**
@@ -95,19 +95,19 @@
         String[][] tests = new String[11][2];
         //Eight tests for class use.
         for (int i = 0; i < 8; i++) {
-            tests[i][0] = BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html";
+            tests[i][0] = "pkg1/class-use/C1.html";
             tests[i][1] = "Test " + (i + 1) + " passes";
         }
         //Three more tests for package use.
         for (int i = 8, j = 1; i < tests.length; i++, j++) {
-            tests[i][0] = BUG_ID + FS + "pkg1" + FS + "package-use.html";
+            tests[i][0] = "pkg1/package-use.html";
             tests[i][1] = "Test " + j + " passes";
         }
         TestUseOption tester = new TestUseOption();
-        run(tester, ARGS, tests, NO_TEST);
+        tester.run(ARGS, tests, NO_TEST);
         tester.printSummary();
-        run(tester, ARGS2, NO_TEST, NO_TEST);
-        String usePageContents = tester.readFileToString(BUG_ID +"-2" + FS + "pkg1" + FS + "class-use" + FS + "UsedClass.html");
+        tester.run(ARGS2, NO_TEST, NO_TEST);
+        String usePageContents = tester.readFileToString("pkg1/class-use/UsedClass.html");
         int prevIndex = -1;
         int currentIndex = -1;
         for (int i = 0; i < TEST2.length; i++) {
@@ -118,22 +118,8 @@
             prevIndex = currentIndex;
         }
         tester.printSummary();
-        run(tester, ARGS3, TEST3, NO_TEST);
-        run(tester, ARGS4, TEST4, NO_TEST);
+        tester.run(ARGS3, TEST3, NO_TEST);
+        tester.run(ARGS4, TEST4, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -34,92 +34,89 @@
 
 public class TestValueTag extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4764045";
-
     //Javadoc arguments.
     private static final String[] ARGS =
         new String[] {
-            "-d", BUG_ID, "-sourcepath", SRC_DIR, "-tag",
+            "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-tag",
             "todo", "pkg1", "pkg2"
         };
 
     private static final String[] ARGS1 =
         new String[] {
             "-Xdoclint:none",
-            "-d", BUG_ID + "-1", "-sourcepath", SRC_DIR, "-tag",
+            "-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR, "-tag",
             "todo", "pkg1", "pkg2"
         };
 
     //Input for string search tests.
     private static final String[][] TEST = {
         //Base case:  using @value on a constant.
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 1 passes\""},
         //Retrieve value of constant in same class.
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 2 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 3 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 4 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 5 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 6 passes\""},
         //Retrieve value of constant in different class.
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 7 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 8 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 9 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 10 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 11 passes\""},
         //Retrieve value of constant in different package
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 12 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 13 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 14 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 15 passes\""},
-        {BUG_ID + FS + "pkg1" + FS + "Class2.html",
+        { "pkg1/Class2.html",
             "Result:  \"Test 16 passes\""},
         //Retrieve value of constant from a package page
-        {BUG_ID + FS + "pkg2" + FS + "package-summary.html",
+        { "pkg2/package-summary.html",
             "Result: \"Test 17 passes\""},
         //Test @value tag used with custom tag.
-        {BUG_ID + FS + "pkg1" + FS + "CustomTagUsage.html",
-            "Todo:" + NL +
+        { "pkg1/CustomTagUsage.html",
+            "Todo:\n" +
                 "the value of this constant is 55."},
         //Test @value errors printed dues to invalid use or when used with
         //non-constant or with bad references.
-        {ERROR_OUTPUT,"error: value does not refer to a constant" + NL +
+        {ERROR_OUTPUT,"error: value does not refer to a constant\n" +
             "     * Result:  {@value TEST_12_ERROR}"
         },
-        {ERROR_OUTPUT,"error: {@value} not allowed here" + NL +
+        {ERROR_OUTPUT,"error: {@value} not allowed here\n" +
             "     * Result:  {@value}"
         },
-        {ERROR_OUTPUT,"error: value does not refer to a constant" + NL +
+        {ERROR_OUTPUT,"error: value does not refer to a constant\n" +
             "     * Result:  {@value NULL}"
         },
-        {ERROR_OUTPUT,"error: {@value} not allowed here" + NL +
+        {ERROR_OUTPUT,"error: {@value} not allowed here\n" +
             "     * Invalid (null): {@value}"
         },
-        {ERROR_OUTPUT,"error: {@value} not allowed here" + NL +
+        {ERROR_OUTPUT,"error: {@value} not allowed here\n" +
             "     * Invalid (non-constant field): {@value}"
         },
-        {ERROR_OUTPUT,"error: value does not refer to a constant" + NL +
+        {ERROR_OUTPUT,"error: value does not refer to a constant\n" +
             "     * Here is a bad value reference: {@value UnknownClass#unknownConstant}"
         },
-        {ERROR_OUTPUT,"error: reference not found" + NL +
+        {ERROR_OUTPUT,"error: reference not found\n" +
             "     * Here is a bad value reference: {@value UnknownClass#unknownConstant}"
         },
-        {ERROR_OUTPUT,"error: {@value} not allowed here" + NL +
+        {ERROR_OUTPUT,"error: {@value} not allowed here\n" +
             "     * @todo the value of this constant is {@value}"
         }
     };
@@ -144,7 +141,7 @@
     };
     private static final String[][] NEGATED_TEST = {
         //Base case:  using @value on a constant.
-        {BUG_ID + FS + "pkg1" + FS + "Class1.html",
+        { "pkg1/Class1.html",
             "Result:  \"Test 12 " +
             "generates an error message\""},
     };
@@ -155,9 +152,9 @@
      */
     public static void main(String[] args) {
         TestValueTag tester = new TestValueTag();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         checkForException(tester);
-        run(tester, ARGS1, TEST1, NO_TEST);
+        tester.run(ARGS1, TEST1, NO_TEST);
         checkForException(tester);
         tester.printSummary();
     }
@@ -167,18 +164,4 @@
             throw new AssertionError("javadoc threw DocletAbortException");
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java
--- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -35,15 +35,13 @@
 
 public class TestWarnBadParamNames extends JavadocTester {
 
-    private static final String BUG_ID = "4693440";
     private static final String[][] TEST = {
         {WARNING_OUTPUT, "warning - @param argument \"int\" is not a parameter name."},
         {WARNING_OUTPUT, "warning - @param argument \"IDontExist\" is not a parameter name."},
         {WARNING_OUTPUT, "warning - Parameter \"arg\" is documented more than once."},
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
     private static final String[] ARGS = new String[] {
-        "-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "C.java"
+        "-Xdoclint:none", "-d", OUTPUT_DIR, SRC_DIR + "/C.java"
     };
 
     /**
@@ -52,21 +50,7 @@
      */
     public static void main(String[] args) {
         TestWarnBadParamNames tester = new TestWarnBadParamNames();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java
--- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2014, 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
@@ -38,16 +38,14 @@
 
 public class TestWarnings extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "4515705-4804296-4702454-4697036";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-Xdoclint:none", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
     };
 
     private static final String[] ARGS2 = new String[] {
-        "-Xdoclint:none", "-d", BUG_ID, "-private", "-sourcepath", SRC_DIR, "pkg"
+        "-Xdoclint:none", "-d", OUTPUT_DIR, "-private", "-sourcepath", SRC_DIR,
+        "pkg"
     };
 
     //Input for string search tests.
@@ -59,42 +57,29 @@
 
     };
     private static final String[][] NEGATED_TEST = {
-        {BUG_ID + FS + "pkg" + FS + "X.html", "can't find m()"},
-        {BUG_ID + FS + "pkg" + FS + "X.html", "can't find X()"},
-        {BUG_ID + FS + "pkg" + FS + "X.html", "can't find f"},
+        { "pkg/X.html", "can't find m()"},
+        { "pkg/X.html", "can't find X()"},
+        { "pkg/X.html", "can't find f"},
     };
 
     private static final String[][] TEST2 = {
-        {BUG_ID + FS + "pkg" + FS + "X.html", "m()
"},
-        {BUG_ID + FS + "pkg" + FS + "X.html", "X()
"},
-        {BUG_ID + FS + "pkg" + FS + "X.html", "f
"},
+        { "pkg/X.html",
+            "m()
"},
+        { "pkg/X.html",
+            "X()
"},
+        { "pkg/X.html",
+            "f
"},
     };
 
-    private static final String[][] NEGATED_TEST2 = NO_TEST;
-
-
     /**
      * The entry point of the test.
      * @param args the array of command line arguments.
      */
     public static void main(String[] args) {
         TestWarnings tester = new TestWarnings();
-        run(tester, ARGS, TEST, NEGATED_TEST);
-        run(tester, ARGS2, TEST2, NEGATED_TEST2);
+        tester.run(ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS2, TEST2, NO_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
--- a/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8016675
+ * @bug 8016675 8026736
  * @summary Test for window title.
  * @author Bhavesh Patel
  * @library ../lib/
@@ -33,27 +33,157 @@
 
 public class TestWindowTitle extends JavadocTester {
 
-    private static final String BUG_ID = "8016675";
-    private static final String WIN_TITLE =
+    //Window title with JavaScript special characters.
+    private static final String TITLE_JS_CHARS =
             "Testing \"Window 'Title'\" with a \\ backslash and a / " +
             "forward slash and a \u00e8 unicode char also a    tab and also a " +
             "\t special character another \u0002 unicode)";
-    private static final String[][] TEST = {
-        {BUG_ID + FS  + "overview-summary.html",
+    private static final String[] ARGS_JS_CHARS = new String[]{
+        "-d", OUTPUT_DIR + "-1", "-windowtitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
+    };
+    private static final String[][] TEST_JS_CHARS = {
+        { "overview-summary.html",
             "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " +
             "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " +
             "also a    tab and also a \\t special character another \\u0002 unicode))\";"
         },
     };
-    private static final String[][] NEG_TEST = {
-        {BUG_ID + FS + "overview-summary.html",
+    private static final String[][] NEG_TEST_JS_CHARS = {
+        { "overview-summary.html",
             "parent.document.title=\"Overview (Testing \"Window \'Title\'\" " +
             "with a \\ backslash and a / forward slash and a \u00E8 unicode char " +
             "also a    tab and also a \t special character another \u0002 unicode))\";"
+        }
+    };
+
+    //Window title with a script tag.
+    private static final String TITLE_SCRIPT_TAG =
+            "Testing script tag in title .";
+    private static final String[] ARGS_SCRIPT_TAG = new String[]{
+        "-d", OUTPUT_DIR + "-2", "-windowtitle", TITLE_SCRIPT_TAG, "-sourcepath", SRC_DIR, "p1", "p2"
+    };
+    private static final String[][] TEST_SCRIPT_TAG = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview (Testing script tag in title alert" +
+            "(\\\"Should not pop up\\\").)\";"
         },
+        { "p2/C2.html",
+            "parent.document.title=\"C2 (Testing script tag in title alert" +
+            "(\\\"Should not pop up\\\").)\";"
+        }
+    };
+    private static final String[][] NEG_TEST_SCRIPT_TAG = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview (Testing script tag in title .)\";"
+        },
+        { "p2/C2.html",
+            "parent.document.title=\"C2 (Testing script tag in title .)\";"
+        }
+    };
+
+    //Window title with other HTML tags.
+    private static final String TITLE_HTML_TAGS =
+            "Testing another HTML
 tag. Another tag. A " +
+            "tag with attributes. ";
+    private static final String[] ARGS_EMPTY_TAGS = new String[]{
+        "-d", OUTPUT_DIR + "-5", "-windowtitle", TITLE_EMPTY_TAGS, "-sourcepath", SRC_DIR, "p1", "p2"
+    };
+    private static final String[][] TEST_EMPTY_TAGS = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview\";"
+        }
+    };
+    private static final String[][] NEG_TEST_EMPTY_TAGS = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview ()\";"
+        }
+    };
+
+    //Window title with unicode characters.
+    private static final String TITLE_UNICODE_CHARS =
+            "Testing unicode \u003cscript\u003ealert(\"Should not pop up\")\u003c/script\u003e.";
+    private static final String[] ARGS_UNICODE_CHARS = new String[]{
+        "-d", OUTPUT_DIR + "-6", "-windowtitle", TITLE_UNICODE_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
+    };
+    private static final String[][] TEST_UNICODE_CHARS = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview (Testing unicode alert(\\\"Should " +
+            "not pop up\\\").)\";"
+        }
+    };
+    private static final String[][] NEG_TEST_UNICODE_CHARS = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview (Testing unicode .)\";"
+        }
+    };
+
+    //An empty window title.
+    private static final String TITLE_EMPTY =
+            "";
+    private static final String[] ARGS_EMPTY_TITLE = new String[]{
+        "-d", OUTPUT_DIR + "-7", "-windowtitle", TITLE_EMPTY, "-sourcepath", SRC_DIR, "p1", "p2"
+    };
+    private static final String[][] TEST_EMPTY = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview\";"
+        }
+    };
+
+    //Test doctitle.
+    private static final String[] ARGS_DOCTITLE = new String[]{
+        "-d", OUTPUT_DIR + "-8", "-doctitle", TITLE_JS_CHARS, "-sourcepath", SRC_DIR, "p1", "p2"
+    };
+    private static final String[][] NEG_TEST_DOCTITLE = {
+        { "overview-summary.html",
+            "parent.document.title=\"Overview (Testing \\\"Window \\\'Title\\\'\\\" " +
+            "with a \\\\ backslash and a / forward slash and a \\u00E8 unicode char " +
+            "also a    tab and also a \\t special character another \\u0002 unicode)\";"
+        },
     };
 
     /**
@@ -62,21 +192,14 @@
      */
     public static void main(String[] args) {
         TestWindowTitle tester = new TestWindowTitle();
-        run(tester, ARGS, TEST, NEG_TEST);
+        tester.run(ARGS_JS_CHARS, TEST_JS_CHARS, NEG_TEST_JS_CHARS);
+        tester.run(ARGS_SCRIPT_TAG, TEST_SCRIPT_TAG, NEG_TEST_SCRIPT_TAG);
+        tester.run(ARGS_HTML_TAGS, TEST_HTML_TAGS, NEG_TEST_HTML_TAGS);
+        tester.run(ARGS_HTML_ENTITIES, TEST_HTML_ENTITIES, NEG_TEST_HTML_ENTITIES);
+        tester.run(ARGS_EMPTY_TAGS, TEST_EMPTY_TAGS, NEG_TEST_EMPTY_TAGS);
+        tester.run(ARGS_UNICODE_CHARS, TEST_UNICODE_CHARS, NEG_TEST_UNICODE_CHARS);
+        tester.run(ARGS_EMPTY_TITLE, TEST_EMPTY, NO_TEST);
+        tester.run(ARGS_DOCTITLE, NO_TEST, NEG_TEST_DOCTITLE);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/testXOption/TestXOption.java
--- a/langtools/test/com/sun/javadoc/testXOption/TestXOption.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/testXOption/TestXOption.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, 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
@@ -32,18 +32,15 @@
 
 public class TestXOption extends JavadocTester {
 
-    //Test information.
-    private static final String BUG_ID = "8007687";
-
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-X",
-            SRC_DIR + FS + "TestXOption.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-X",
+            SRC_DIR + "/TestXOption.java"
     };
 
     private static final String[] ARGS2 = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR,
-            SRC_DIR + FS + "TestXOption.java"
+        "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
+            SRC_DIR + "/TestXOption.java"
     };
 
     private static final String[][] TEST = {
@@ -53,7 +50,6 @@
         {STANDARD_OUTPUT, "-Xdoclint "},
         {STANDARD_OUTPUT, "-Xdoclint:"},
     };
-    private static final String[][] NEGATED_TEST = NO_TEST;
 
     //The help option should not crash the doclet.
     private static final int EXPECTED_EXIT_CODE = 0;
@@ -64,22 +60,8 @@
      */
     public static void main(String[] args) {
         TestXOption tester = new TestXOption();
-        int actualExitCode = run(tester, ARGS, TEST, NEGATED_TEST);
+        int actualExitCode = tester.run(ARGS, TEST, NO_TEST);
         tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2014, 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
@@ -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 + FS + "pkg" + FS + "T0x1C.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x1D.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x0D.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x06.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x0B.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "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 + FS + "pkg" + FS + "T0x20.html", "@DA"},
+        { "pkg/T0x20.html", "@DA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + FS + "pkg" + FS + "T0x20A.html", "@DTPA"},
+        { "pkg/T0x20A.html", "@DTPA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + FS + "pkg" + FS + "T0x20B.html", "@DA"},
+        { "pkg/T0x20B.html", "@DA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + FS + "pkg" + FS + "T0x22.html", "@DA"},
+        { "pkg/T0x22.html", "@DA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + FS + "pkg" + FS + "T0x22A.html", "@DTPA"},
+        { "pkg/T0x22A.html", "@DTPA"},
         */
         /* @ignore 8013406: Test cases fail in javadoc test TestSmoke.java
-        {BUG_ID + FS + "pkg" + FS + "T0x22B.html", "@DA"},
+        { "pkg/T0x22B.html", "@DA"},
         */
-        {BUG_ID + FS + "pkg" + FS + "T0x10.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x10A.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x12.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x11.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x13.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x15.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "T0x14.html", "@DA"},
-        {BUG_ID + FS + "pkg" + FS + "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 + FS + "pkg" + FS + "T0x1C.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x1D.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x00.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x01.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x02.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x04.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x08.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x0D.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x06.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x0B.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x0F.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x20.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x20A.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x20B.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x22.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x22A.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x22B.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x10.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x10A.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x12.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x11.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x13.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x15.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "T0x14.html", "@A"},
-        {BUG_ID + FS + "pkg" + FS + "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"}
     };
 
     /**
@@ -114,21 +111,7 @@
      */
     public static void main(String[] args) {
         TestSmoke tester = new TestSmoke();
-        run(tester, ARGS, TEST, NEGATED_TEST);
+        tester.run(ARGS, TEST, NEGATED_TEST);
         tester.printSummary();
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugId() {
-        return BUG_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getBugName() {
-        return getClass().getName();
-    }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/T8029002/MultipleUpperBoundsIncorporationTest.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/*
+ * @test
+ * @bug 8029002
+ * @summary javac should take multiple upper bounds into account in incorporation
+ * @compile MultipleUpperBoundsIncorporationTest.java
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MultipleUpperBoundsIncorporationTest {
+
+    static class TestCase1 {
+        interface Task {}
+
+        class Comparator {}
+
+        class CustomException extends Exception {}
+
+        class TaskQueue> {}
+
+        abstract class Test {
+            abstract > TaskQueue create(Comparator comparator);
+
+            void f(Comparator> comp) {
+                TaskQueue> queue = create(comp);
+                queue.getClass();
+            }
+        }
+    }
+
+    static class TestCase2 {
+        public > E typedNull() {
+            return null;
+        }
+
+        public void call() {
+            ArrayList list = typedNull();
+        }
+    }
+
+    static class TestCase3 {
+        interface I extends Iterable {}
+
+        > Exp typedNull() { return null; }
+        I i = typedNull();
+    }
+
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/**
+ * @test
+ * @bug 8038788
+ * @summary Verify proper handling of annotations after method's type parameters.
+ * @build AfterMethodTypeParams
+ * @run main AfterMethodTypeParams
+ */
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.net.URI;
+import java.util.*;
+
+import javax.lang.model.element.Name;
+import javax.tools.*;
+
+import com.sun.source.tree.*;
+import com.sun.source.util.*;
+
+public class AfterMethodTypeParams {
+
+    public static void main(String... args) throws IOException {
+        new AfterMethodTypeParams().run();
+    }
+
+    void run() throws IOException {
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+
+        for (TestCase tc : testCases) {
+            String test = TEMPLATE.replace("CONTENT", tc.snippet);
+            List files = Arrays.asList(new MyFileObject(test));
+            StringWriter out = new StringWriter();
+            List options = Arrays.asList("-XDrawDiagnostics", "-XDshouldStopPolicy=FLOW");
+            JavacTask task = (JavacTask) compiler.getTask(out, null, null, options, null, files);
+
+            new TreePathScanner() {
+                boolean seenAnnotation;
+                @Override
+                public Void visitAnnotation(AnnotationTree node, Void p) {
+                    Name name = ((IdentifierTree) node.getAnnotationType()).getName();
+                    seenAnnotation |= name.contentEquals("TA") || name.contentEquals("DA");
+                    return null;
+                }
+                @Override
+                public Void visitCompilationUnit(CompilationUnitTree node, Void p) {
+                    super.visitCompilationUnit(node, p);
+                    if (!seenAnnotation)
+                        error(test, "Annotation was missing");
+                    return null;
+                }
+            }.scan(task.parse(), null);
+
+            task.analyze();
+
+            if (!tc.error.equals(out.toString().trim())) {
+                error(test, "Incorrect errors: " + out.toString());
+            }
+        }
+
+        if (errors > 0) {
+            throw new IllegalStateException("Errors found");
+        }
+    }
+
+    int errors;
+
+    void error(String code, String error) {
+        System.out.println("Error detected: " + error);
+        System.out.println("Code:");
+        System.out.println(code);
+        errors++;
+    }
+
+    static String TEMPLATE =
+        "import java.lang.annotation.*;\n" +
+        "public class Test {\n" +
+        "    CONTENT\n" +
+        "}\n" +
+        "@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})\n" +
+        "@interface DA { }\n" +
+        "@Target(ElementType.TYPE_USE)\n" +
+        "@interface TA { }\n";
+
+    static class MyFileObject extends SimpleJavaFileObject {
+        final String text;
+        public MyFileObject(String text) {
+            super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
+            this.text = text;
+        }
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return text;
+        }
+    }
+
+    static TestCase[] testCases = new TestCase[] {
+        new TestCase(" @DA int foo1() { return 0;}", ""),
+        new TestCase(" @DA void foo2() { }", ""),
+        new TestCase(" @TA int foo3() { return 0;}", ""),
+        new TestCase(" @TA void foo4() { }",
+                "Test.java:3:9: compiler.err.annotation.type.not.applicable"),
+        new TestCase(" @DA Test() { }", "Test.java:3:9: compiler.err.illegal.start.of.type"),
+        new TestCase(" @TA Test() { }", "Test.java:3:9: compiler.err.illegal.start.of.type"),
+    };
+
+    static class TestCase {
+        final String snippet;
+        final String error;
+        public TestCase(String snippet, String error) {
+            this.snippet = snippet;
+            this.error = error;
+        }
+    }
+}
+
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java
--- a/langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java	Tue Apr 29 14:40:07 2014 -0700
@@ -41,7 +41,7 @@
 
     private void run() throws IOException, ConstantPoolException {
         File testClasses = new File(System.getProperty("test.classes"));
-        for (File classFile : testClasses.listFiles()) {
+        for (File classFile : testClasses.listFiles(f -> f.getName().endsWith(".class"))) {
             ClassFile cf = ClassFile.read(classFile);
             if (cf.getName().matches(".*\\$[0-9]+")) {
                 EnclosingMethod_attribute encl =
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/diags/examples.not-yet.txt
--- a/langtools/test/tools/javac/diags/examples.not-yet.txt	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/diags/examples.not-yet.txt	Tue Apr 29 14:40:07 2014 -0700
@@ -113,3 +113,4 @@
 compiler.warn.file.from.future                          # warning for future modification times on files
 compiler.err.cant.inherit.from.anon                     # error for subclass of anonymous class
 compiler.misc.bad.class.file                            # class file is malformed
+compiler.misc.bad.const.pool.entry                      # constant pool entry has wrong type
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/diags/examples/LambdaBodyNeitherValueNorVoidCompatible.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+// key: compiler.err.lambda.body.neither.value.nor.void.compatible
+// key: compiler.err.cant.apply.symbol
+// key: compiler.misc.incompatible.ret.type.in.lambda
+// key: compiler.misc.missing.ret.val
+// key: compiler.misc.no.conforming.assignment.exists
+
+class LambdaBodyNeitherValueNorVoidCompatible {
+    interface I {
+        String f(String x);
+    }
+
+    static void foo(I i) {}
+
+    void m() {
+        foo((x) -> {
+            if (x == null) {
+                return;
+            } else {
+                return x;
+            }
+        });
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/ErroneousLambdaExpr.java
--- a/langtools/test/tools/javac/lambda/ErroneousLambdaExpr.java	Tue Apr 29 15:44:14 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2012, 2013 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.
- */
-
-/*
- * @test
- * @bug 8003280
- * @summary Add lambda tests
- *  stale state after speculative attribution round leads to missing classfiles
- * @compile/fail/ref=ErroneousLambdaExpr.out -XDrawDiagnostics ErroneousLambdaExpr.java
- */
-public class ErroneousLambdaExpr {
-
-    static int assertionCount = 0;
-
-    static void assertTrue(boolean cond) {
-        assertionCount++;
-        if (!cond)
-            throw new AssertionError();
-    }
-
-    interface SAM1 {
-        X m(X t, String s);
-    }
-
-    interface SAM2 {
-        void m(String s, int i);
-    }
-
-    interface SAM3 {
-        X m(X t, String s, int i);
-    }
-
-    void call(SAM1 s1) { assertTrue(true); }
-
-    void call(SAM2 s2) { assertTrue(false); }
-
-    void call(SAM3 s3) { assertTrue(false); }
-
-    public static void main(String[] args) {
-        ErroneousLambdaExpr test =
-                new ErroneousLambdaExpr<>();
-
-        test.call((builder, string) -> { builder.append(string); return builder; });
-        assertTrue(assertionCount == 1);
-    }
-}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/ErroneousLambdaExpr.out
--- a/langtools/test/tools/javac/lambda/ErroneousLambdaExpr.out	Tue Apr 29 15:44:14 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-ErroneousLambdaExpr.java:63:13: compiler.err.ref.ambiguous: call, kindname.method, call(ErroneousLambdaExpr.SAM1), ErroneousLambdaExpr, kindname.method, call(ErroneousLambdaExpr.SAM2), ErroneousLambdaExpr
-1 error
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/LambdaExprLeadsToMissingClassFilesTest.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2012, 2014 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.
+ */
+
+/*
+ * @test
+ * @bug 8003280
+ * @summary Add lambda tests
+ *  stale state after speculative attribution round leads to missing classfiles
+ */
+public class LambdaExprLeadsToMissingClassFilesTest {
+
+    static int assertionCount = 0;
+
+    static void assertTrue(boolean cond) {
+        assertionCount++;
+        if (!cond) {
+            throw new AssertionError();
+        }
+    }
+
+    interface SAM1 {
+        X m(X t, String s);
+    }
+
+    interface SAM2 {
+        void m(String s, int i);
+    }
+
+    interface SAM3 {
+        X m(X t, String s, int i);
+    }
+
+    void call(SAM1 s1) { assertTrue(true); }
+
+    void call(SAM2 s2) { assertTrue(false); }
+
+    void call(SAM3 s3) { assertTrue(false); }
+
+    public static void main(String[] args) {
+        LambdaExprLeadsToMissingClassFilesTest test =
+                new LambdaExprLeadsToMissingClassFilesTest<>();
+
+        test.call((builder, string) -> { builder.append(string); return builder; });
+        assertTrue(assertionCount == 1);
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/MostSpecific09.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/MostSpecific09.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,81 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8029718
+ * @summary Should always use lambda body structure to disambiguate overload resolution
+ * @compile/fail/ref=MostSpecific09.out -XDrawDiagnostics -XDshouldStopPolicy=ATTR -XDverboseResolution=applicable,success MostSpecific09.java
+ */
+
+class MostSpecific09 {
+
+    interface I {
+        String xoo(String x);
+    }
+
+    interface J {
+        void xoo(int x);
+    }
+
+    static void foo(I i) {}
+    static void foo(J j) {}
+
+    static void moo(I i) {}
+    static void moo(J j) {}
+
+    void m() {
+        foo((x) -> { return x += 1; });
+        foo((x) -> { return ""; });
+        foo((x) -> { System.out.println(""); });
+        foo((x) -> { return ""; System.out.println(""); });
+        foo((x) -> { throw new RuntimeException(); });
+        foo((x) -> { while (true); });
+
+        foo((x) -> x += 1);
+        foo((x) -> "");
+    }
+
+    /* any return statement that is not in the body of the lambda but in an
+     * inner class or another lambda should be ignored for value void compatibility
+     * determination.
+     */
+    void m1() {
+        boolean cond = true;
+        foo((x) -> {
+            if (cond) {
+                return "";
+            }
+            System.out.println("");
+        });
+
+        foo((x)->{
+            class Bar {
+                String m() {
+                    return "from Bar.m()";
+                }
+            }
+            class Boo {
+                Bar b = new Bar (){
+                    String m() {
+                        return "from Bar$1.m()";
+                    }
+                };
+            }
+            moo((y) -> { return ""; });
+            return;
+        });
+
+        foo((x)->{
+            class Bar {
+                void m() {}
+            }
+            class Boo {
+                Bar b = new Bar (){
+                    void m() {
+                        return;
+                    }
+                };
+            }
+            moo((y) -> { System.out.println(""); });
+            return "";
+        });
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/MostSpecific09.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/MostSpecific09.out	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,27 @@
+MostSpecific09.java:25:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.I), null)}
+MostSpecific09.java:26:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.I), null)}
+MostSpecific09.java:27:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.J), null)}
+MostSpecific09.java:27:32: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
+MostSpecific09.java:28:13: compiler.err.lambda.body.neither.value.nor.void.compatible
+MostSpecific09.java:28:9: compiler.err.cant.apply.symbols: kindname.method, foo, @680,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
+MostSpecific09.java:28:43: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
+MostSpecific09.java:29:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
+MostSpecific09.java:29:28: compiler.note.verbose.resolve.multi: , java.lang.RuntimeException, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, java.lang.RuntimeException(), null)}
+MostSpecific09.java:30:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
+MostSpecific09.java:32:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(MostSpecific09.I), MostSpecific09, kindname.method, foo(MostSpecific09.J), MostSpecific09
+MostSpecific09.java:33:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.I), null)}
+MostSpecific09.java:42:13: compiler.err.lambda.body.neither.value.nor.void.compatible
+MostSpecific09.java:42:9: compiler.err.cant.apply.symbols: kindname.method, foo, @1129,{(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.I), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))),(compiler.misc.inapplicable.method: kindname.method, MostSpecific09, foo(MostSpecific09.J), (compiler.misc.no.conforming.assignment.exists: (compiler.misc.unexpected.ret.val)))}
+MostSpecific09.java:46:23: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
+MostSpecific09.java:49:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.J), null)}
+MostSpecific09.java:56:25: compiler.note.verbose.resolve.multi: , Bar, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, Bar(), null)}
+MostSpecific09.java:56:35: compiler.note.verbose.resolve.multi: , Bar, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, Bar(), null)}
+MostSpecific09.java:56:25: compiler.note.verbose.resolve.multi: , compiler.misc.anonymous.class: MostSpecific09$1Boo$1, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, compiler.misc.anonymous.class: MostSpecific09$1Boo$1(), null)}
+MostSpecific09.java:62:13: compiler.note.verbose.resolve.multi: moo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, moo(MostSpecific09.I), null)}
+MostSpecific09.java:66:9: compiler.note.verbose.resolve.multi: foo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, foo(MostSpecific09.I), null)}
+MostSpecific09.java:71:25: compiler.note.verbose.resolve.multi: , Bar, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, Bar(), null)}
+MostSpecific09.java:71:35: compiler.note.verbose.resolve.multi: , Bar, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, Bar(), null)}
+MostSpecific09.java:71:25: compiler.note.verbose.resolve.multi: , compiler.misc.anonymous.class: MostSpecific09$2Boo$1, 0, BASIC, compiler.misc.no.args, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, compiler.misc.anonymous.class: MostSpecific09$2Boo$1(), null)}
+MostSpecific09.java:77:13: compiler.note.verbose.resolve.multi: moo, MostSpecific09, 0, BASIC, compiler.misc.type.none, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, moo(MostSpecific09.J), null)}
+MostSpecific09.java:77:36: compiler.note.verbose.resolve.multi: println, java.io.PrintStream, 1, BASIC, java.lang.String, compiler.misc.no.args,{(compiler.misc.applicable.method.found: 0, println(java.lang.Object), null),(compiler.misc.applicable.method.found: 1, println(java.lang.String), null)}
+7 errors
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/T8037935/LambdaWithBinOpConstRefToConstString.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/*
+ * @test
+ * @bug 8037935
+ * @summary Javac: final local String var referenced in binary/unary op in lambda produces code that does not verify
+ * @run main LambdaWithBinOpConstRefToConstString
+ */
+
+interface MyFI {
+    void accept();
+}
+
+public class LambdaWithBinOpConstRefToConstString {
+    public static void main(String[] args) {
+        final String CONSTANT_STRING_VALUE = "mwmwm";
+
+        MyFI consumeStrings = () -> {
+            System.out.println(" local constant: " + CONSTANT_STRING_VALUE);
+        };
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/T8038420/LambdaIncrement.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/lambda/T8038420/LambdaIncrement.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/**
+ * @test
+ * @bug 8038420
+ * @summary Lambda returning post-increment generates wrong code
+ * @run main LambdaIncrement
+ */
+
+public class LambdaIncrement {
+
+    interface IntegerOp { Integer apply(Integer arg); }
+
+    private static void assertNotIncremented(IntegerOp lmb, String label) {
+        int result = lmb.apply(3);
+        if (result != 3) {
+            throw new AssertionError("Post-increment failure. Expected 3, got: " +
+                                     result + " " + label);
+        }
+    }
+
+    public static void main(String... args) throws Exception {
+        assertNotIncremented(x -> x++, "PostIncExpr");
+        assertNotIncremented(x -> { return x++; }, "PostIncReturn");
+        assertNotIncremented(x -> { int y = x; return y++; }, "PostIncLocal");
+        assertNotIncremented(x -> { Integer y = x; return y++; }, "PostIncLocalBox");
+        assertNotIncremented(x -> { int y = x; return y; }, "HASINIT");
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/TargetType01.java
--- a/langtools/test/tools/javac/lambda/TargetType01.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/TargetType01.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -42,6 +42,10 @@
     static String M(F_S_S f){ return null; }
 
     static {
-        M(x1 -> { return M( x2 -> { return x1 + x2; });}); //ambiguous
+        M(x1 -> {
+            return M( x2 -> {
+                return x1 + x2;
+            });
+        }); //ambiguous
     }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/TargetType01.out
--- a/langtools/test/tools/javac/lambda/TargetType01.out	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/TargetType01.out	Tue Apr 29 14:40:07 2014 -0700
@@ -1,3 +1,3 @@
 TargetType01.java:45:9: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01
-TargetType01.java:45:26: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01
+TargetType01.java:46:20: compiler.err.ref.ambiguous: M, kindname.method, M(TargetType01.F_I_I), TargetType01, kindname.method, M(TargetType01.F_S_S), TargetType01
 2 errors
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/TargetType02.java
--- a/langtools/test/tools/javac/lambda/TargetType02.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/TargetType02.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,31 +1,9 @@
 /*
- * Copyright (c) 2011, 2013, 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.
- */
-
-/*
- * @test
- * @bug 8003280
+ * @test /nodynamiccopyright/
+ * @bug 8003280 8029718
  * @summary Add lambda tests
  *  check overload resolution and target type inference w.r.t. generic methods
+ * Should always use lambda body structure to disambiguate overload resolution
  * @author  Maurizio Cimadamore
  * @compile/fail/ref=TargetType02.out -XDrawDiagnostics TargetType02.java
  */
@@ -47,9 +25,18 @@
     static  void call3(S1 s) { }
     static  void call3(S2 s) { }
 
+    static  Z call4(S1 s) { return null; }
+    static  Z call4(S2 s) { return null; }
+
     void test() {
         call1(i -> { toString(); return i; });
         call2(i -> { toString(); return i; });
         call3(i -> { toString(); return i; });
+        call3(i -> {
+            toString();
+            return call4(j -> {
+                return j;
+            });
+        });
     }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/TargetType02.out
--- a/langtools/test/tools/javac/lambda/TargetType02.out	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/TargetType02.out	Tue Apr 29 14:40:07 2014 -0700
@@ -1,3 +1,5 @@
-TargetType02.java:52:14: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, java.lang.String)
-TargetType02.java:53:9: compiler.err.ref.ambiguous: call3, kindname.method, call3(TargetType02.S1), TargetType02, kindname.method, call3(TargetType02.S2), TargetType02
-2 errors
+TargetType02.java:33:14: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.lang.Integer, java.lang.String)
+TargetType02.java:34:9: compiler.err.ref.ambiguous: call3, kindname.method, call3(TargetType02.S1), TargetType02, kindname.method, call3(TargetType02.S2), TargetType02
+TargetType02.java:35:9: compiler.err.ref.ambiguous: call3, kindname.method, call3(TargetType02.S1), TargetType02, kindname.method, call3(TargetType02.S2), TargetType02
+TargetType02.java:37:20: compiler.err.ref.ambiguous: call4, kindname.method, call4(TargetType02.S1), TargetType02, kindname.method, call4(TargetType02.S2), TargetType02
+4 errors
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/TargetType21.out
--- a/langtools/test/tools/javac/lambda/TargetType21.out	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/TargetType21.out	Tue Apr 29 14:40:07 2014 -0700
@@ -1,7 +1,5 @@
 TargetType21.java:28:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM2), TargetType21, kindname.method, call(TargetType21.SAM3), TargetType21
-TargetType21.java:31:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM2), TargetType21, kindname.method, call(TargetType21.SAM3), TargetType21
-TargetType21.java:32:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM2), TargetType21, kindname.method, call(TargetType21.SAM3), TargetType21
-TargetType21.java:32:13: compiler.err.cant.apply.symbol: kindname.method, call, TargetType21.SAM2, @888, kindname.class, TargetType21, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.unexpected.ret.val)))
-TargetType21.java:33:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM2), TargetType21, kindname.method, call(TargetType21.SAM3), TargetType21
-TargetType21.java:33:13: compiler.err.cant.apply.symbol: kindname.method, call, TargetType21.SAM2, @946, kindname.class, TargetType21, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.unexpected.ret.val)))
-6 errors
+TargetType21.java:32:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM1), TargetType21, kindname.method, call(TargetType21.SAM3), TargetType21
+TargetType21.java:32:13: compiler.err.cant.apply.symbol: kindname.method, call, TargetType21.SAM1, @888, kindname.class, TargetType21, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.inconvertible.types: java.lang.Object, java.lang.String)))
+TargetType21.java:33:9: compiler.err.ref.ambiguous: call, kindname.method, call(TargetType21.SAM1), TargetType21, kindname.method, call(TargetType21.SAM3), TargetType21
+4 errors
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/TargetType42.java
--- a/langtools/test/tools/javac/lambda/TargetType42.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/TargetType42.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014, 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
@@ -31,12 +31,18 @@
 class TargetType42 {
 
     interface SAM {
-      Y f(X x);
+        Y f(X x);
     }
 
      void m(SAM> s, Z z) { }
 
     void test(Object obj) {
-        m((x)->{ class Foo { }; return (x2)-> { new Foo(); return null; }; }, obj);
+        m((x)->{
+            class Foo { }
+            return (x2)-> {
+                new Foo();
+                return null;
+            };
+        }, obj);
     }
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest1.java
--- a/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest1.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/lambdaExpression/LambdaTest1.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -33,7 +33,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Date;
 
 public class LambdaTest1 {
 
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java
--- a/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -209,7 +209,11 @@
         final JavaCompiler tool = ToolProvider.getSystemJavaCompiler();
         DiagnosticChecker dc = new DiagnosticChecker();
         JavacTask ct = (JavacTask)tool.getTask(null, null, dc, null, null, Arrays.asList(samSourceFile, clientSourceFile));
-        ct.analyze();
+        try {
+            ct.analyze();
+        } catch (Exception e) {
+            throw new AssertionError("failing SAM source file \n" + samSourceFile + "\n\n" + "failing client source file \n"+ clientSourceFile);
+        }
         if (dc.errorFound == checkSamConversion()) {
             throw new AssertionError(samSourceFile + "\n\n" + clientSourceFile);
         }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.out
--- a/langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.out	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/processing/environment/round/ErroneousAnnotations.out	Tue Apr 29 14:40:07 2014 -0700
@@ -1,4 +1,3 @@
 ErroneousAnnotations.java:8:2: compiler.err.cant.resolve: kindname.class, Undefined, , 
 ErroneousAnnotations.java:10:6: compiler.err.cant.resolve.location: kindname.class, Undefined, , , (compiler.misc.location: kindname.class, ErroneousAnnotations, null)
 2 errors
-Results: []
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
--- a/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Tue Apr 29 14:40:07 2014 -0700
@@ -93,7 +93,8 @@
                     roundEnvironment.
                     getElementsAnnotatedWith(elements.getTypeElement(annotatedElementInfo.annotationName()));
 
-                System.err.println("Results: " + resultsMeta);
+                if (!resultsMeta.isEmpty())
+                    System.err.println("Results: " + resultsMeta);
 
                 if (resultsMeta.size() != annotatedElementInfo.expectedSize()) {
                     failed = true;
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javac/tree/DocCommentToplevelTest.java
--- a/langtools/test/tools/javac/tree/DocCommentToplevelTest.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javac/tree/DocCommentToplevelTest.java	Tue Apr 29 14:40:07 2014 -0700
@@ -144,7 +144,8 @@
             public ClassTree visitCompilationUnit(CompilationUnitTree node, Void unused) {
                 docComments = ((JCTree.JCCompilationUnit)node).docComments;
                 boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
-                        (pk != PackageKind.NO_PKG || ik != ImportKind.ZERO);
+                                          pk == PackageKind.NO_PKG &&
+                                          ik != ImportKind.ZERO;
                 boolean foundComment = docComments.hasComment((JCTree) node);
                 if (expectedComment != foundComment) {
                     error("Unexpected comment " + docComments.getComment((JCTree) node) + " on toplevel");
@@ -153,6 +154,17 @@
             }
 
             @Override
+            public ClassTree visitPackage(PackageTree node, Void unused) {
+                boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
+                                          pk != PackageKind.NO_PKG;
+                boolean foundComment = docComments.hasComment((JCTree) node);
+                if (expectedComment != foundComment) {
+                    error("Unexpected comment " + docComments.getComment((JCTree) node) + " on toplevel");
+                }
+                return super.visitPackage(node, null);
+            }
+
+            @Override
             public ClassTree visitClass(ClassTree node, Void unused) {
                 boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
                         pk == PackageKind.NO_PKG && ik == ImportKind.ZERO &&
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javadoc/6964914/TestStdDoclet.java
--- a/langtools/test/tools/javadoc/6964914/TestStdDoclet.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javadoc/6964914/TestStdDoclet.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2014, 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
@@ -57,6 +57,7 @@
         Process p = new ProcessBuilder()
             .command(javadoc.getPath(),
                 "-J-Xbootclasspath:" + System.getProperty("sun.boot.class.path"),
+                "-classpath", ".", // insulates us from ambient classpath
                 "-Xdoclint:none",
                 "-package",
                 new File(testSrc, thisClassName + ".java").getPath())
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javadoc/parser/7091528/T7091528.java
--- a/langtools/test/tools/javadoc/parser/7091528/T7091528.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/javadoc/parser/7091528/T7091528.java	Tue Apr 29 14:40:07 2014 -0700
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug     7091528 8029145
+ * @bug     7091528 8029145 8037484
  * @summary ensures javadoc parses unique source files and ignores all class files
  * @compile p/C1.java p/q/C2.java
  * @run main T7091528
@@ -50,6 +50,16 @@
             "-sourcepath", testSrc.getAbsolutePath(),
             "-subpackages",
             "p:p.q");
+        File testPkgDir = new File(testSrc, "p");
+        File testFile = new File(testPkgDir, "C3.java");
+        runTest("-d", ".",
+            "-sourcepath", testSrc.getAbsolutePath(),
+            testFile.getAbsolutePath(),
+            "p");
+        runTest("-d", ".",
+            "-classpath", testSrc.getAbsolutePath(),
+            testFile.getAbsolutePath(),
+            "p");
 
     }
     void runTest(String... args) {
@@ -65,7 +75,7 @@
         }
 
         if (rc != 0)
-            System.err.println("javadoc failed: exit code = " + rc);
+            throw new Error("javadoc failed: exit code = " + rc);
 
         if (out.matches("(?s).*p/[^ ]+\\.class.*"))
             throw new Error("reading .class files");
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/javadoc/parser/7091528/p/C3.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javadoc/parser/7091528/p/C3.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+
+/** This is class C3, and no package for me please */
+public class C3 {}
+
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/ExclPattern.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/ExclPattern.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class ExclPattern {
+
+    public static void main(String[] ignore) throws IOException {
+
+        String toBeExcluded = "pkg/excl-dir/excluded.txt";
+        String toBeIncluded = "pkg/incl-dir/included.txt";
+
+        // Set up source directory with directory to be excluded
+        populate(Paths.get("srcdir"),
+            "pkg/SomeClass.java",
+            "package pkg; public class SomeClass { }",
+
+            toBeExcluded,
+            "This file should not end up in the dest directory.",
+
+            toBeIncluded,
+            "This file should end up in the dest directory.");
+
+        String[] args = {
+                "-x", "pkg/excl-dir/*",
+                "-src", "srcdir",
+                "-d", "dest",
+                "-j", "1",
+                "-copy", ".txt",
+                "--server:portfile=testserver,background=false",
+                "--log=debug"
+        };
+
+        int rc = new com.sun.tools.sjavac.Main().go(args, System.out, System.err);
+        if (rc != 0) throw new RuntimeException("Error during compile!");
+
+        if (!Files.exists(Paths.get("dest/" + toBeIncluded)))
+            throw new AssertionError("File missing: " + toBeIncluded);
+
+        if (Files.exists(Paths.get("dest/" + toBeExcluded)))
+            throw new AssertionError("File present: " + toBeExcluded);
+    }
+
+    static void populate(Path root, String... args) throws IOException {
+        if (!Files.exists(root))
+            Files.createDirectory(root);
+        for (int i = 0; i < args.length; i += 2) {
+            String filename = args[i];
+            String content = args[i+1];
+            Path p = root.resolve(filename);
+            Files.createDirectories(p.getParent());
+            try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(p,
+                    Charset.defaultCharset()))) {
+                out.println(content);
+            }
+        }
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/ExclPatternWrapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/ExclPatternWrapper.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/*
+ * @test
+ * @bug 8037085
+ * @summary Ensures that sjavac can handle various exclusion patterns.
+ * @run main ExclPatternWrapper
+ */
+public class ExclPatternWrapper {
+    public static void main(String... args) throws Exception {
+        SJavacTestUtil.runSjavacTest("ExclPattern", args);
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/JavacOptionPrep.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/JavacOptionPrep.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Iterator;
+
+import com.sun.tools.sjavac.options.Options;
+
+
+public class JavacOptionPrep {
+
+    enum TestPath {
+        CP1, CP2, SRC1, SRC2, SOURCEPATH1, SOURCEPATH2;
+
+        public String toString() {
+            return name().toLowerCase();
+        }
+    }
+
+    private final static String SEP = File.pathSeparator;
+
+    public static void main(String[] unused) throws IOException {
+
+        for (TestPath p : TestPath.values())
+            Files.createDirectory(Paths.get(p.toString()));
+
+        // Test some various cases:
+        //  - Paths combined with File.pathSeparator (CP1 / CP2)
+        //  - Paths given as duplicate options (SOURCEPATH1 / SOURCEPATH2)
+        //  - Sources provided by -src (SRC1)
+        //  - Sources provided without preceding option (SRC2)
+        //  - An unrecognized option which is to be passed on to javac
+        String sjavacArgs = "-cp " + TestPath.CP1 + SEP + TestPath.CP2 +
+                            " -d dest " +
+                            " -h header" +
+                            " -sourcepath " + TestPath.SOURCEPATH1 +
+                            " -src " + TestPath.SRC1 +
+                            " -s gensrc" +
+                            " -sourcepath " + TestPath.SOURCEPATH2 +
+                            " " + TestPath.SRC2 +
+                            " -unrecognized";
+
+        Options options = Options.parseArgs(sjavacArgs.split(" "));
+
+        // Extract javac-options
+        String[] javacArgs = options.prepJavacArgs();
+
+        // Check the result
+        boolean destDirFound = false;
+        boolean headerDirFound = false;
+        boolean gensrcDirFound = false;
+        boolean classPathFound = false;
+        boolean sourcePathFound = false;
+        boolean unrecognizedFound = false;
+        boolean implicitNoneFound = false;
+
+        Iterator javacArgIter = Arrays.asList(javacArgs).iterator();
+        while (javacArgIter.hasNext()) {
+
+            String option = javacArgIter.next();
+
+            switch (option) {
+            case "-classpath":
+            case "-cp":
+                classPathFound = true;
+                assertEquals(TestPath.CP1 + SEP + TestPath.CP2,
+                             javacArgIter.next());
+                break;
+
+            case "-d":
+                destDirFound = true;
+                assertEquals(Paths.get("dest").toAbsolutePath().toString(),
+                             javacArgIter.next());
+                break;
+
+            case "-h":
+                headerDirFound = true;
+                assertEquals(Paths.get("header").toAbsolutePath().toString(),
+                             javacArgIter.next());
+                break;
+
+            case "-s":
+                gensrcDirFound = true;
+                assertEquals(Paths.get("gensrc").toAbsolutePath().toString(),
+                             javacArgIter.next());
+                break;
+
+            case "-sourcepath":
+                sourcePathFound = true;
+                assertEquals(TestPath.SRC1 + SEP +
+                             TestPath.SRC2 + SEP +
+                             TestPath.SOURCEPATH1 + SEP +
+                             TestPath.SOURCEPATH2,
+                             javacArgIter.next());
+                break;
+
+            case "-unrecognized":
+                unrecognizedFound = true;
+                break;
+
+            case "-implicit:none":
+                implicitNoneFound = true;
+                break;
+
+                // Note that *which* files to actually compile is not dealt
+                // with by prepJavacArgs.
+
+            default:
+                throw new AssertionError("Unexpected option found: " + option);
+            }
+        }
+
+        if (!destDirFound)
+            throw new AssertionError("Dest directory not found.");
+
+        if (!headerDirFound)
+            throw new AssertionError("Header directory not found.");
+
+        if (!gensrcDirFound)
+            throw new AssertionError("Generated source directory not found.");
+
+        if (!classPathFound)
+            throw new AssertionError("Class path not found.");
+
+        if (!sourcePathFound)
+            throw new AssertionError("Source path not found.");
+
+        if (!unrecognizedFound)
+            throw new AssertionError("\"-unrecognized\" not found.");
+
+        if (!implicitNoneFound)
+            throw new AssertionError("\"-implicit:none\" not found.");
+
+    }
+
+    static void assertEquals(Object expected, Object actual) {
+        if (!expected.equals(actual))
+            throw new AssertionError("Expected " + expected + " but got " + actual);
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/JavacOptionPrepWrapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/JavacOptionPrepWrapper.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/*
+ * @test
+ * @bug 8035063
+ * @summary Tests the preparation of javac-arguments.
+ * @run main JavacOptionPrepWrapper
+ */
+public class JavacOptionPrepWrapper {
+    public static void main(String... args) throws Exception {
+        SJavacTestUtil.runSjavacTest("JavacOptionPrep", args);
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/OptionDecoding.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/OptionDecoding.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import static util.OptionTestUtil.assertEquals;
+import static util.OptionTestUtil.checkFilesFound;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.tools.sjavac.CopyFile;
+import com.sun.tools.sjavac.Main;
+import com.sun.tools.sjavac.Module;
+import com.sun.tools.sjavac.Source;
+import com.sun.tools.sjavac.options.Options;
+import com.sun.tools.sjavac.options.SourceLocation;
+
+public class OptionDecoding {
+
+    public static void main(String[] args) throws IOException {
+
+        testPaths();
+        testDupPaths();
+        testSourceLocations();
+        testSimpleOptions();
+        testServerConf();
+        testSearchPaths();
+        testTranslationRules();
+
+    }
+
+    // Test decoding of output paths
+    static void testPaths() throws IOException {
+
+        final String H = "headers";
+        final String G = "gensrc";
+        final String D = "dest";
+        final String CMP = "srcRefList.txt";
+
+        Options options = Options.parseArgs("-h", H, "-s", G, "-d", D,
+                                            "--compare-found-sources", CMP);
+
+        assertEquals(Paths.get(H).toAbsolutePath(), options.getHeaderDir());
+        assertEquals(Paths.get(G).toAbsolutePath(), options.getGenSrcDir());
+        assertEquals(Paths.get(D).toAbsolutePath(), options.getDestDir());
+        assertEquals(Paths.get(CMP), options.getSourceReferenceList());
+
+    }
+
+    // Providing duplicate header / dest / gensrc paths should produce an error.
+    static void testDupPaths() throws IOException {
+
+        try {
+            Options.parseArgs("-h", "dir1", "-h", "dir2");
+            throw new RuntimeException("Duplicate header directories should fail.");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
+
+        try {
+            Options.parseArgs("-s", "dir1", "-s", "dir2");
+            throw new RuntimeException("Duplicate paths for generated sources should fail.");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
+
+        try {
+            Options.parseArgs("-d", "dir1", "-d", "dir2");
+            throw new RuntimeException("Duplicate destination directories should fail.");
+        } catch (IllegalArgumentException iae) {
+            // Expected
+        }
+
+    }
+
+    // Test source locations and -x, -i, -xf, -if filters
+    static void testSourceLocations() throws IOException {
+
+        Path a1 = Paths.get("root/pkg1/ClassA1.java");
+        Path a2 = Paths.get("root/pkg1/ClassA2.java");
+        Path b1 = Paths.get("root/pkg1/pkg2/ClassB1.java");
+        Path b2 = Paths.get("root/pkg1/pkg2/ClassB2.java");
+        Path c1 = Paths.get("root/pkg3/ClassC1.java");
+        Path c2 = Paths.get("root/pkg3/ClassC2.java");
+
+        for (Path p : Arrays.asList(a1, a2, b1, b2, c1, c2)) {
+            Files.createDirectories(p.getParent());
+            Files.createFile(p);
+        }
+
+        // Test -if
+        {
+            Options options = Options.parseArgs("-if", "root/pkg1/ClassA1.java", "root");
+
+            Map foundFiles = new HashMap<>();
+            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+                    new HashMap(), new Module("", ""), false, true);
+
+            checkFilesFound(foundFiles.keySet(), a1);
+        }
+
+        // Test -i
+        System.out.println("--------------------------- CHECKING -i ----------------");
+        {
+            Options options = Options.parseArgs("-i", "pkg1/*", "root");
+
+            Map foundFiles = new HashMap<>();
+            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+                    new HashMap(), new Module("", ""), false, true);
+
+            checkFilesFound(foundFiles.keySet(), a1, a2, b1, b2);
+        }
+        System.out.println("--------------------------------------------------------");
+
+        // Test -xf
+        {
+            Options options = Options.parseArgs("-xf", "root/pkg1/ClassA1.java", "root");
+
+            Map foundFiles = new HashMap<>();
+            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+                    new HashMap(), new Module("", ""), false, true);
+
+            checkFilesFound(foundFiles.keySet(), a2, b1, b2, c1, c2);
+        }
+
+        // Test -x
+        {
+            Options options = Options.parseArgs("-i", "pkg1/*", "root");
+
+            Map foundFiles = new HashMap<>();
+            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+                    new HashMap(), new Module("", ""), false, true);
+
+            checkFilesFound(foundFiles.keySet(), a1, a2, b1, b2);
+        }
+
+        // Test -x and -i
+        {
+            Options options = Options.parseArgs("-i", "pkg1/*", "-x", "pkg1/pkg2/*", "root");
+
+            Map foundFiles = new HashMap<>();
+            Main.findSourceFiles(options.getSources(), Collections.singleton(".java"), foundFiles,
+                    new HashMap(), new Module("", ""), false, true);
+
+            checkFilesFound(foundFiles.keySet(), a1, a2);
+        }
+
+    }
+
+    // Test basic options
+    static void testSimpleOptions() {
+
+        Options options = Options.parseArgs("-j", "17", "--log=debug");
+        assertEquals(17, options.getNumCores());
+        assertEquals("debug", options.getLogLevel());
+        assertEquals(false, options.isDefaultPackagePermitted());
+        assertEquals(false, options.isUnidentifiedArtifactPermitted());
+
+        options = Options.parseArgs("--permit-unidentified-artifacts",
+                                    "--permit-sources-without-package");
+        assertEquals("info", options.getLogLevel());
+        assertEquals(true, options.isDefaultPackagePermitted());
+        assertEquals(true, options.isUnidentifiedArtifactPermitted());
+    }
+
+    // Test server configuration options
+    static void testServerConf() {
+        Options options = Options.parseArgs("--server:someServerConfiguration");
+        assertEquals("someServerConfiguration", options.getServerConf());
+        assertEquals(false, options.startServerFlag());
+
+        options = Options.parseArgs("--startserver:someServerConfiguration");
+        assertEquals("someServerConfiguration", options.getServerConf());
+        assertEquals(true, options.startServerFlag());
+    }
+
+    // Test input paths
+    static void testSearchPaths() {
+
+        List i, x, iF, xF;
+        i = x = iF = xF = new ArrayList<>();
+
+        SourceLocation dir1 = new SourceLocation(Paths.get("dir1"), i, x, iF, xF);
+        SourceLocation dir2 = new SourceLocation(Paths.get("dir2"), i, x, iF, xF);
+
+        Options options = Options.parseArgs("-sourcepath", "dir1:dir2");
+        assertEquals(options.getSourceSearchPaths(), Arrays.asList(dir1, dir2));
+
+        options = Options.parseArgs("-modulepath", "dir1:dir2");
+        assertEquals(options.getModuleSearchPaths(), Arrays.asList(dir1, dir2));
+
+        options = Options.parseArgs("-classpath", "dir1:dir2");
+        assertEquals(options.getClassSearchPath(), Arrays.asList(dir1, dir2));
+    }
+
+    // Test -tr option
+    static void testTranslationRules() {
+
+        Class cls = com.sun.tools.sjavac.CompileJavaPackages.class;
+
+        Options options = Options.parseArgs(
+                "-tr", ".exa=" + cls.getName(),
+                "-tr", ".exb=" + cls.getName(),
+                "-copy", ".html");
+
+        assertEquals(cls, options.getTranslationRules().get(".exa").getClass());
+        assertEquals(cls, options.getTranslationRules().get(".exb").getClass());
+        assertEquals(CopyFile.class, options.getTranslationRules().get(".html").getClass());
+
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/OptionDecodingWrapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/OptionDecodingWrapper.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/*
+ * @test
+ * @bug 8035063
+ * @summary Tests decoding of String[] into Options.
+ * @run main OptionDecodingWrapper
+ */
+public class OptionDecodingWrapper {
+    public static void main(String... args) throws Exception {
+        SJavacTestUtil.runSjavacTest("OptionDecoding", args);
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/SJavacTestUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/SJavacTestUtil.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+
+public class SJavacTestUtil {
+
+    public static void runSjavacTest(String testClassName, String[] args)
+            throws Exception {
+
+        if (!isSJavacOnClassPath()) {
+            System.out.println("sjavac not available: pass by default");
+            return;
+        }
+
+        File srcDir = new File(System.getProperty("test.src"));
+        File clsDir = new File(System.getProperty("test.classes"));
+
+        File src = new File(srcDir, testClassName + ".java");
+        File cls = new File(clsDir, testClassName + ".class");
+
+        if (cls.lastModified() < src.lastModified()) {
+            System.err.println("Recompiling test class...");
+            String[] javacArgs = { "-d", clsDir.getPath(), src.getPath() };
+            int rc = com.sun.tools.javac.Main.compile(javacArgs);
+            if (rc != 0)
+                throw new Exception("compilation failed");
+        }
+
+        Class sjavac = Class.forName(testClassName);
+        Method main = sjavac.getMethod("main", String[].class);
+        main.invoke(null, new Object[] { args });
+
+    }
+
+    private static boolean isSJavacOnClassPath() {
+        String cls = "com/sun/tools/sjavac/Main.class";
+        return SJavacTestUtil.class.getClassLoader().getResource(cls) != null;
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/SJavacWrapper.java
--- a/langtools/test/tools/sjavac/SJavacWrapper.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/langtools/test/tools/sjavac/SJavacWrapper.java	Tue Apr 29 14:40:07 2014 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
@@ -31,37 +31,8 @@
  * @run main SJavacWrapper
  */
 
-import java.io.*;
-import java.lang.reflect.Method;
-import java.net.*;
-
-
-public
-class SJavacWrapper {
-
+public class SJavacWrapper {
     public static void main(String... args) throws Exception {
-        URL url = SJavacWrapper.class.getClassLoader().getResource("com/sun/tools/sjavac/Main.class");
-        if (url == null) {
-            // No sjavac in the classpath.
-            System.out.println("sjavac not available: pass by default");
-            return;
-        }
-
-        File testSrc = new File(System.getProperty("test.src"));
-        File sjavac_java = new File(testSrc, "SJavac.java");
-        File testClasses = new File(System.getProperty("test.classes"));
-        File sjavac_class = new File(testClasses, "SJavac.class");
-        if (sjavac_class.lastModified() < sjavac_java.lastModified()) {
-            String[] javac_args = { "-d", testClasses.getPath(), sjavac_java.getPath() };
-            System.err.println("Recompiling SJavac.java");
-            int rc = com.sun.tools.javac.Main.compile(javac_args);
-            if (rc != 0)
-                throw new Exception("compilation failed");
-        }
-
-        Class sjavac = Class.forName("SJavac");
-        Method sjavac_main = sjavac.getMethod("main", String[].class);
-        sjavac_main.invoke(null, new Object[] { args });
+        SJavacTestUtil.runSjavacTest("SJavac", args);
     }
-
 }
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/Serialization.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/Serialization.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import static util.OptionTestUtil.assertEquals;
+
+import java.io.IOException;
+import java.util.Map;
+
+import com.sun.tools.sjavac.CompileJavaPackages;
+import com.sun.tools.sjavac.Transformer;
+import com.sun.tools.sjavac.options.Option;
+import com.sun.tools.sjavac.options.Options;
+import com.sun.tools.sjavac.options.SourceLocation;
+
+
+public class Serialization {
+
+    public static void main(String[] args) throws IOException {
+
+        // Create reference options
+        Options options1 = Options.parseArgs(
+                Option.H.arg, "headers",
+                Option.S.arg, "gensrc",
+                Option.D.arg, "dest",
+                Option.I.arg, "pkg/*",
+                Option.X.arg, "pkg/pkg/*",
+                Option.IF.arg, "root/pkg/MyClass1.java",
+                Option.XF.arg, "root/pkg/MyClass2.java",
+                Option.SRC.arg, "root",
+                Option.SOURCEPATH.arg, "sourcepath",
+                Option.CLASSPATH.arg, "classpath",
+                Option.MODULEPATH.arg, "modulepath",
+                Option.PERMIT_SOURCES_WITHOUT_PACKAGE.arg,
+                Option.PERMIT_UNIDENTIFIED_ARTIFACTS.arg,
+                Option.TR.arg, ".prop=" + CompileJavaPackages.class.getName(),
+                Option.J.arg, "999",
+                "-someJavacArg",
+                "-someOtherJavacArg");
+
+        // Serialize
+        String serialized = options1.getStateArgsString();
+
+        // Deserialize
+        Options options2 = Options.parseArgs(serialized.split(" "));
+
+        // Make sure we got the same result
+        assertEquals(options1.getHeaderDir(), options2.getHeaderDir());
+        assertEquals(options1.getGenSrcDir(), options2.getGenSrcDir());
+        assertEquals(options1.getDestDir(), options2.getDestDir());
+
+        SourceLocation sl1 = options1.getSources().get(0);
+        SourceLocation sl2 = options2.getSources().get(0);
+        assertEquals(sl1.getPath(), sl2.getPath());
+        assertEquals(sl1.getIncludes(), sl2.getIncludes());
+        assertEquals(sl1.getExcludes(), sl2.getExcludes());
+        assertEquals(sl1.getIncludedFiles(), sl2.getIncludedFiles());
+        assertEquals(sl1.getExcludedFiles(), sl2.getExcludedFiles());
+
+        assertEquals(options1.getClassSearchPath(), options2.getClassSearchPath());
+        assertEquals(options1.getSourceSearchPaths(), options2.getSourceSearchPaths());
+        assertEquals(options1.getModuleSearchPaths(), options2.getModuleSearchPaths());
+
+        Map trRules1 = options1.getTranslationRules();
+        Map trRules2 = options2.getTranslationRules();
+        assertEquals(trRules1.keySet(), trRules2.keySet());
+        assertEquals(trRules1.values().iterator().next().getClass(),
+                     trRules2.values().iterator().next().getClass());
+        assertEquals(options1.getJavacArgs(), options2.getJavacArgs());
+
+        assertEquals(999, options1.getNumCores());
+        if (options2.getNumCores() == 999)
+            throw new AssertionError("Num cores should not be part of serialization");
+    }
+
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/SerializationWrapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/SerializationWrapper.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+/*
+ * @test
+ * @bug 8035063
+ *
+ * @summary Tests serialization of options. The options needs to be serialized
+ *          and saved in the state file since the files need to be recompiled
+ *          if new options are provided.
+ *
+ * @run main SerializationWrapper
+ */
+public class SerializationWrapper {
+    public static void main(String... args) throws Exception {
+        SJavacTestUtil.runSjavacTest("Serialization", args);
+    }
+}
diff -r 1d117d2dfe92 -r 2061862eb57c langtools/test/tools/sjavac/util/OptionTestUtil.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/sjavac/util/OptionTestUtil.java	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2014, 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 util;
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import com.sun.tools.sjavac.options.SourceLocation;
+
+
+public class OptionTestUtil {
+
+    public static void checkFilesFound(Collection found, Path... expected) {
+
+        Collection expectedStrs = new HashSet();
+        for (Path p : expected)
+            expectedStrs.add(p.toString());
+
+        if (!expectedStrs.containsAll(found))
+            throw new AssertionError("Expected (" + expectedStrs + ") does not " +
+                                     "contain all actual (" + found + ")");
+
+        if (!found.containsAll(expectedStrs))
+            throw new AssertionError("Actual (" + found + ") does not " +
+                                     "contain all expected (" + expectedStrs + ")");
+    }
+
+    public static void assertEquals(List expected, List actual) {
+        if (expected.size() != actual.size())
+            throw new AssertionError("Expected locs of length " + expected.size() + " but got something of size " + actual.size());
+
+        Iterator iter1 = expected.iterator();
+        Iterator iter2 = actual.iterator();
+
+        while (iter1.hasNext()) {
+            SourceLocation sl1 = iter1.next();
+            SourceLocation sl2 = iter2.next();
+
+            if (!sl1.getPath().equals(sl2.getPath()) ||
+                    !sl1.getIncludes().equals(sl2.getIncludes()) ||
+                    !sl1.getExcludes().equals(sl2.getExcludes()) ||
+                    !sl1.getIncludedFiles().equals(sl2.getIncludedFiles()) ||
+                    !sl1.getExcludedFiles().equals(sl2.getExcludedFiles()))
+                throw new AssertionError("Expected " + sl1 + " but got " + sl2);
+        }
+    }
+
+    public static void assertEquals(Object expected, Object actual) {
+        if (!expected.equals(actual))
+            throw new AssertionError("Expected " + expected + " but got " + actual);
+    }
+
+}
diff -r 1d117d2dfe92 -r 2061862eb57c make/Javadoc.gmk
--- a/make/Javadoc.gmk	Tue Apr 29 15:44:14 2014 -0400
+++ b/make/Javadoc.gmk	Tue Apr 29 14:40:07 2014 -0700
@@ -25,6 +25,18 @@
 include $(SPEC)
 include MakeBase.gmk
 
+#################################################################
+#
+# CORE_PKGS environment variable has been moved to the following file
+#
+include CORE_PKGS.gmk
+#
+# Load environment variables for API package names that are not part of
+# the Java SE platform
+#
+include NON_CORE_PKGS.gmk
+
+
 .SUFFIXES: # Delete the default suffixes
 .SUFFIXES: .java
 
@@ -165,20 +177,9 @@
 	$(MKDIR) -p $(@D)
 endef
 
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
-  $(shell \
-      if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
-        for p in $1 ; do \
-          pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-          $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
-        done; \
-      fi \
-  )
+$(eval $(call FillCacheFind, $(ALL_SOURCE_DIRS)))
+define PackageDependencies
+  $(call CacheFind, $(foreach p, $(subst .,/,$1), $(addsuffix /$p, $(ALL_SOURCE_DIRS))))
 endef
 
 # Given a list of packages, add packages that exist to $@, print summary
@@ -203,9 +204,9 @@
 
 # Print out a summary of the javadoc command about to be run
 define JavadocSummary # optionsfile packagesfile
-	@$(ECHO) "# Summary for $@"; \
-	$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1; \
-	$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2
+	@$(ECHO) "# Running javadoc for $(patsubst $(OUTPUT_ROOT)/%,%,$@)" $(LOG_WARN)
+	@($(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1) $(LOG_DEBUG)
+	@($(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2) $(LOG_DEBUG)
 endef
 
 #
@@ -300,19 +301,6 @@
 #################################################################
 
 #
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
 # Default target is same as docs target, create core api and all others it can
 #
 
@@ -415,7 +403,7 @@
         endif
 
 # Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
+$(COREAPI_PACKAGES_FILE): $(call PackageDependencies,$(CORE_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(CORE_PKGS))
 
@@ -447,7 +435,7 @@
 $(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
+$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -470,7 +458,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
+$(DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(DOCLETAPI_PKGS)) 
 	$(prep-target)
 	$(call PackageFilter,$(DOCLETAPI_PKGS))
 
@@ -489,7 +477,7 @@
 TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
 
 # The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
+TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/com/sun/tools/doclets/Taglet.html
 TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
 TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
 
@@ -499,15 +487,15 @@
 $(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
+$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(RM) -r $(TAGLETAPI_TEMPDIR)
 	$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
 	$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
 	    @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
-	cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
-	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
+	cp -r $(TAGLETAPI_TEMPDIR)/com $(TAGLETAPI_DOCDIR)
+	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(TAGLETAPI_DOCDIR)
 	$(RM) -r $(TAGLETAPI_TEMPDIR)
 
 # Create file with javadoc options in it
@@ -524,7 +512,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
+$(TAGLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(TAGLETAPI_PKGS))
 	$(prep-target)
 	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
 
@@ -556,7 +544,7 @@
 $(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
+$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -579,7 +567,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
+$(DOMAPI_PACKAGES_FILE): $(call PackageDependencies,$(DOMAPI_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(DOMAPI_PKGS))
 
@@ -619,7 +607,7 @@
 $(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
+$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -641,7 +629,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
+$(JDI_PACKAGES_FILE): $(call PackageDependencies,$(JDI_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(JDI_PKGS))
 
@@ -674,7 +662,6 @@
 $(JVMTI_DOCDIR)/jvmti.html:
 	@$(prep-javadoc)
 	@if [ -f $(JVMTI_HTML) ] ; then \
-	  $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
 	  $(CP) $(JVMTI_HTML) $@; \
 	else \
 	  $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
@@ -707,7 +694,7 @@
 $(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
+$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -729,7 +716,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
+$(JAAS_PACKAGES_FILE): $(call PackageDependencies,$(JAAS_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(JAAS_PKGS))
 
@@ -760,7 +747,7 @@
 $(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
+$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -783,7 +770,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
+$(JGSS_PACKAGES_FILE): $(call PackageDependencies,$(JGSS_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(JGSS_PKGS))
 
@@ -813,7 +800,7 @@
 $(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
+$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -835,7 +822,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
+$(SMARTCARDIO_PACKAGES_FILE): $(call PackageDependencies,$(SMARTCARDIO_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(SMARTCARDIO_PKGS))
 
@@ -864,7 +851,7 @@
 $(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
+$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -886,7 +873,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
+$(HTTPSERVER_PACKAGES_FILE): $(call PackageDependencies,$(HTTPSERVER_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(HTTPSERVER_PKGS))
 
@@ -919,10 +906,9 @@
 $(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
+$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	@if [ -f $(JVM_MIB_SRC) ] ; then \
-	  $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
 	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
 	else \
 	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
@@ -948,7 +934,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
+$(MGMT_PACKAGES_FILE): $(call PackageDependencies,$(MGMT_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(MGMT_PKGS))
 
@@ -977,7 +963,7 @@
 $(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
+$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -999,7 +985,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
+$(ATTACH_PACKAGES_FILE): $(call PackageDependencies,$(ATTACH_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(ATTACH_PKGS))
 
@@ -1028,7 +1014,7 @@
 $(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
+$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -1050,7 +1036,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
+$(JCONSOLE_PACKAGES_FILE): $(call PackageDependencies,$(JCONSOLE_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(JCONSOLE_PKGS))
 
@@ -1081,7 +1067,7 @@
 $(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
+$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -1104,7 +1090,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
+$(TREEAPI_PACKAGES_FILE): $(call PackageDependencies,$(TREEAPI_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(TREEAPI_PKGS))
 
@@ -1133,7 +1119,7 @@
 $(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
+$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -1155,7 +1141,7 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
+$(SCTPAPI_PACKAGES_FILE): $(call PackageDependencies,$(SCTPAPI_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(SCTPAPI_PKGS))
 
@@ -1184,7 +1170,7 @@
 $(JDKNET_INDEX_HTML): GET2DOCSDIR=$(JDKNET2COREAPI)/..
 
 # Run javadoc if the index file is out of date or missing
-$(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE) coredocs
+$(JDKNET_INDEX_HTML): $(JDKNET_OPTIONS_FILE) $(JDKNET_PACKAGES_FILE) $(COREAPI_INDEX_FILE)
 	$(prep-javadoc)
 	$(call JavadocSummary,$(JDKNET_OPTIONS_FILE),$(JDKNET_PACKAGES_FILE))
 	$(JAVADOC_CMD) -d $(@D) \
@@ -1206,22 +1192,11 @@
 	) >> $@
 
 # Create a file with the package names in it
-$(JDKNET_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDKNET_PKGS))
+$(JDKNET_PACKAGES_FILE): $(call PackageDependencies,$(JDKNET_PKGS))
 	$(prep-target)
 	$(call PackageFilter,$(JDKNET_PKGS))
 
 #############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
-	$(prep-target)
-	@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
-	  $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
-	  $(FIND) $${cp} -type f >> $@; \
-	done
-
-#############################################################
 #release version of core packages ########
 
 # The rel-coredocs and rel-docs targets were added by Eric Armstrong. rel-coredocs
diff -r 1d117d2dfe92 -r 2061862eb57c make/common/JavaCompilation.gmk
--- a/make/common/JavaCompilation.gmk	Tue Apr 29 15:44:14 2014 -0400
+++ b/make/common/JavaCompilation.gmk	Tue Apr 29 14:40:07 2014 -0700
@@ -445,8 +445,8 @@
   # Now we have a list of all java files to compile: $$($1_SRCS)
 
   # Create the corresponding smart javac wrapper command line.
-  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
-      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
+  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix /*,$$($1_EXCLUDES))) \
+      $$(addprefix -i ,$$(addsuffix /*,$$($1_INCLUDES))) \
       $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
       $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
       -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
diff -r 1d117d2dfe92 -r 2061862eb57c make/common/MakeBase.gmk
--- a/make/common/MakeBase.gmk	Tue Apr 29 15:44:14 2014 -0400
+++ b/make/common/MakeBase.gmk	Tue Apr 29 14:40:07 2014 -0700
@@ -421,52 +421,57 @@
 not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
 
 ifneq ($(DISABLE_CACHE_FIND), true)
-################################################################################
-# In Cygwin, finds are very costly, both because of expensive forks and because
-# of bad file system caching. Find is used extensively in $(shell) commands to
-# find source files. This makes rerunning make with no or few changes rather
-# expensive. To speed this up, these two macros are used to cache the results
-# of simple find commands for reuse.
-#
-# Runs a find and stores both the directories where it was run and the results.
-# This macro can be called multiple times to add to the cache. Only finds files
-# with no filters.
-#
-# Needs to be called with $(eval )
-#
+  ################################################################################
+  # In Cygwin, finds are very costly, both because of expensive forks and because
+  # of bad file system caching. Find is used extensively in $(shell) commands to
+  # find source files. This makes rerunning make with no or few changes rather
+  # expensive. To speed this up, these two macros are used to cache the results
+  # of simple find commands for reuse.
+  #
+  # Runs a find and stores both the directories where it was run and the results.
+  # This macro can be called multiple times to add to the cache. Only finds files
+  # with no filters.
+  #
+  # Needs to be called with $(eval )
+  #
   # Even if the performance benifit is negligible on other platforms, keep the
   # functionality active unless explicitly disabled to exercise it more.
   #
   # Initialize FIND_CACHE_DIRS with := to make it a non recursively-expanded variable
   FIND_CACHE_DIRS :=
-# Param 1 - Dir to find in
+  # Param 1 - Dirs to find in
+  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
   define FillCacheFind
-    # Filter out already cached dirs. The - is needed when FIND_CACHE_DIR is empty
+    # Filter out already cached dirs. The - is needed when FIND_CACHE_DIRS is empty
     # since filter out will then return empty.
     FIND_CACHE_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
         - $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS), $1)
     ifneq ($$(FIND_CACHE_NEW_DIRS), )
       # Remove any trailing slash from dirs in the cache dir list
       FIND_CACHE_DIRS += $$(patsubst %/,%, $$(FIND_CACHE_NEW_DIRS))
-      FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $$(FIND_CACHE_NEW_DIRS) -type f -o -type l))
+      FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $$(FIND_CACHE_NEW_DIRS) \( -type f -o -type l \) $2))
     endif
   endef
 
-# Mimics find by looking in the cache if all of the directories have been cached.
-# Otherwise reverts to shell find. This is safe to call on all platforms, even if
-# cache is deactivated.
-#
-# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
-# Param 1 - Dirs to find in
-define CacheFind
+  # Mimics find by looking in the cache if all of the directories have been cached.
+  # Otherwise reverts to shell find. This is safe to call on all platforms, even if
+  # cache is deactivated.
+  #
+  # The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless.
+  #
+  # Param 1 - Dirs to find in
+  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
+  define CacheFind
     $(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \
-    $(shell $(FIND) $1 -type f -o -type l), \
+    $(shell $(FIND) $1 \( -type f -o -type l \) $2), \
     $(filter $(addsuffix %,$1),$(FIND_CACHE)))
-endef
+  endef
 else
   # If CacheFind is disabled, just run the find command.
+  # Param 1 - Dirs to find in
+  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
   define CacheFind
-    $(shell $(FIND) $1 -type f -o -type l)
+    $(shell $(FIND) $1 \( -type f -o -type l \) $2)
   endef
 endif
 
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/.hgtags
--- a/nashorn/.hgtags	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/.hgtags	Tue Apr 29 14:40:07 2014 -0700
@@ -241,3 +241,6 @@
 2a1cac93c33317d828d4a5b81239204a9927cc4a jdk9-b05
 1f75bcbe74e315470dc0b75b7d5bcd209e287c39 jdk9-b06
 9a34d2a0a5bdaf0bf0d81d6fe6324aa0cfb35bfe jdk9-b07
+4764920fd81d631915b13ba03b5d962ab14a50c4 jdk9-b08
+27f6ea87dcbd52c4b59e34a9f18d5b3321d53fa7 jdk9-b09
+0eaa55c7abe5d96023a4b38a326f411209c43f49 jdk9-b10
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
--- a/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java	Tue Apr 29 14:40:07 2014 -0700
@@ -211,7 +211,8 @@
         if(!CheckRestrictedPackage.isRestrictedClass(clazz)) {
             searchSuperTypes = false;
             for(Method method: clazz.getMethods()) {
-                if(instance != Modifier.isStatic(method.getModifiers())) {
+                final boolean isStatic = Modifier.isStatic(method.getModifiers());
+                if(instance != isStatic) {
                     final MethodSignature sig = new MethodSignature(method);
                     if(!methods.containsKey(sig)) {
                         final Class declaringClass = method.getDeclaringClass();
@@ -228,7 +229,10 @@
                             //generate the said synthetic delegators.
                             searchSuperTypes = true;
                         } else {
-                            methods.put(sig, method);
+                            // don't allow inherited static
+                            if (!isStatic || clazz == declaringClass) {
+                                methods.put(sig, method);
+                            }
                         }
                     }
                 }
@@ -245,7 +249,8 @@
             searchSuperTypes = true;
         }
 
-        if(searchSuperTypes) {
+        // don't need to search super types for static methods
+        if(instance && searchSuperTypes) {
             // If we reach here, the class is either not public, or it is in a restricted package. Alternatively, it is
             // public, but some of its methods claim that their declaring class is non-public. We'll try superclasses
             // and implemented interfaces then looking for public ones.
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
--- a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java	Tue Apr 29 14:40:07 2014 -0700
@@ -136,7 +136,13 @@
         final Field[] fields = clazz.getFields();
         final Collection cfields = new ArrayList<>(fields.length);
         for(Field field: fields) {
-            if(instance != Modifier.isStatic(field.getModifiers()) && isAccessible(field)) {
+            final boolean isStatic = Modifier.isStatic(field.getModifiers());
+            if(isStatic && clazz != field.getDeclaringClass()) {
+                // ignore inherited static fields
+                continue;
+            }
+
+            if(instance != isStatic && isAccessible(field)) {
                 cfields.add(field);
             }
         }
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java	Tue Apr 29 14:40:07 2014 -0700
@@ -89,6 +89,15 @@
         }
 
         @Override
+        protected void setImpl(final int index, final long value) {
+            if (JSType.isRepresentableAsInt(value)) {
+                setImpl(index, (int)value);
+            } else {
+                buffer.getByteArray()[byteIndex(index)] = value > 0 ? (byte)0xff : 0;
+            }
+        }
+
+        @Override
         protected void setImpl(final int key, final double value) {
             setImpl(key, (int)Math.rint(value));
         }
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/src/jdk/nashorn/internal/runtime/JSType.java
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java	Tue Apr 29 14:40:07 2014 -0700
@@ -438,7 +438,9 @@
 
         // encode integer part from least significant digit, then reverse
         do {
-            sb.append(chars.charAt((int) (intPart % radix)));
+            final double remainder = intPart % radix;
+            sb.append(chars.charAt((int) remainder));
+            intPart -= remainder;
             intPart /= radix;
         } while (intPart >= 1.0);
 
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/ReflectionCheckLinker.java	Tue Apr 29 14:40:07 2014 -0700
@@ -39,16 +39,38 @@
  * Check java reflection permission for java reflective and java.lang.invoke access from scripts
  */
 final class ReflectionCheckLinker implements TypeBasedGuardingDynamicLinker{
+    private static final Class STATEMENT_CLASS  = getBeanClass("Statement");
+    private static final Class XMLENCODER_CLASS = getBeanClass("XMLEncoder");
+    private static final Class XMLDECODER_CLASS = getBeanClass("XMLDecoder");
+
+    private static Class getBeanClass(final String name) {
+        try {
+            return Class.forName("java.beans." + name);
+        } catch (final ClassNotFoundException cnfe) {
+            // Possible to miss this class in other profiles.
+            return null;
+        }
+    }
+
     @Override
     public boolean canLinkType(final Class type) {
         return isReflectionClass(type);
     }
 
     private static boolean isReflectionClass(final Class type) {
+        // Class or ClassLoader subclasses
         if (type == Class.class || ClassLoader.class.isAssignableFrom(type)) {
             return true;
         }
 
+        // check for bean reflection
+        if ((STATEMENT_CLASS != null && STATEMENT_CLASS.isAssignableFrom(type)) ||
+            (XMLENCODER_CLASS != null && XMLENCODER_CLASS.isAssignableFrom(type)) ||
+            (XMLDECODER_CLASS != null && XMLDECODER_CLASS.isAssignableFrom(type))) {
+            return true;
+        }
+
+        // package name check
         final String name = type.getName();
         return name.startsWith("java.lang.reflect.") || name.startsWith("java.lang.invoke.");
     }
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/test/script/basic/JDK-8030199.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8030199.js	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2014, 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.
+ */
+
+/**
+ * JDK-8030199: Nashorn: Uint8ClampedArray - Incorrect ToUint8Clamp implementation
+ *
+ * @test
+ * @run
+ */
+
+function testTypedArray(ArrayType) {
+    print(ArrayType.BYTES_PER_ELEMENT);
+    var a = new ArrayType(7);
+    a[0] = 4294967296;
+    a[1] = -4294967295;
+    a[2] = 4294967298;
+    a[3] = -4294967298;
+    a[4] = Infinity;
+    a[5] = -Infinity;
+    a[6] = NaN;
+    print(Array.prototype.join.call(a));
+}
+
+testTypedArray(Uint8ClampedArray);
+testTypedArray(Uint8Array);
+testTypedArray(Int8Array);
+testTypedArray(Uint16Array);
+testTypedArray(Int16Array);
+testTypedArray(Uint32Array);
+testTypedArray(Int32Array);
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/test/script/basic/JDK-8030199.js.EXPECTED
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8030199.js.EXPECTED	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,14 @@
+1
+255,0,255,0,255,0,0
+1
+0,1,2,254,0,0,0
+1
+0,1,2,-2,0,0,0
+2
+0,1,2,65534,0,0,0
+2
+0,1,2,-2,0,0,0
+4
+0,1,2,4294967294,0,0,0
+4
+0,1,2,-2,0,0,0
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/test/script/basic/JDK-8030200.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8030200.js	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2014, 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.
+ */
+
+/**
+ * JDK-8030200: Wrong result for Number.prototype.toString() for certain radix/inputs
+ *
+ * @test
+ * @run
+ */
+
+var n = 0x8000000000000800;
+print(n);
+var s = n.toString(5);
+var m = parseInt(s, 5);
+print(m === n);
+print(n);
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/test/script/basic/JDK-8030200.js.EXPECTED
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nashorn/test/script/basic/JDK-8030200.js.EXPECTED	Tue Apr 29 14:40:07 2014 -0700
@@ -0,0 +1,3 @@
+9223372036854778000
+true
+9223372036854778000
diff -r 1d117d2dfe92 -r 2061862eb57c nashorn/test/script/basic/NASHORN-173.js.EXPECTED
--- a/nashorn/test/script/basic/NASHORN-173.js.EXPECTED	Tue Apr 29 15:44:14 2014 -0400
+++ b/nashorn/test/script/basic/NASHORN-173.js.EXPECTED	Tue Apr 29 14:40:07 2014 -0700
@@ -132,7 +132,7 @@
 2.3423446609034533e+21
 2.3423446609034533e+21
 11111101111101010001111111010101101000101011011001001000000000000000000
-2224143002343343220233144213324
+2224143002343343220233044213324
 375752177255053311000000
 73b92b9962990aa44400
 7efa8fead15b240000

<W extends java.lang.String,V extends " +
             "java.util.List>
java.lang.Object " +
-                 "UsedInC  " +
+            "UsedInC

" + - "Class	\n" + + "	Description	" + - "Interface	\n" + + "	Description	" + - "Enum	\n" + + "	Description	" + - "Annotation Type	\n" + + "	Description	Modifier and Type	Modifier and Type	Field and Description	Modifier and Type	Modifier and Type	Method and Description	Modifier and Type	Modifier and Type	Class and Description	Constructor and Description	Enum Constant and Description	Modifier and Type	Modifier and Type	Required Element and Description	Modifier and Type	Modifier and Type	Optional Element and Description	Package	Package	Description	Modifier and Type	Modifier and Type	Field and Description	Modifier and Type	Modifier and Type	Method and Description	Modifier and Type	Modifier and Type	Field and Description	Modifier and Type	Modifier and Type	Method and Description	Package	Package	Description	Modifier and Type	Modifier and Type	Method and Description	Package	Package	Description	Class and Description	Package	Package	Description	Class and Description	Field and Description	Method and Description	" + - "Modifier and Type	Value	" + - "Package	\n" + + "	Description	`rate`" + NL + + { "C.html", + " public final void setRate(double value) \n" + + " Sets the value of the property rate. \n" + + " \n" + + " Property description: " }, + { "C.html", + " public final double getRate() \n" + + " Gets the value of the property rate. \n" + + " \n" + + " Property description: " }, + { "C.html", + "	`rate`\n" + " Defines the direction/speed at which the `Timeline` is expected to"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "Default value:"}, - {"./" + BUG_ID + "/C.html", - "Since:" + NL + " JavaFX 8.0 " }, - {"./" + BUG_ID + "/C.html", + { "C.html", + "Since:\n" + + " JavaFX 8.0 " }, + { "C.html", " Sets the value of the property `Property`"}, - {"./" + BUG_ID + "/C.html", + { "C.html", " Gets the value of the property `Property`"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "Property description:"}, - {"./" + BUG_ID + "/C.html", + { "C.html", "	`setTestMethodProperty()`	`default void`
`default default void`	`default void`

Field Summary

DEFAULT_NAME

DEFAULT_NAME

Annotation Type Hierarchy

Enum Hierarchy

Enum Hierarchy

Methods inherited from class java.lang.Object

Package pkg1

Class " + "pkg1.C1 extends java.lang.Object implements Serializable

Serialized Fields

Test Files

isPaused

isPaused

Properties inherited from class C

Properties inherited from class C

Required Element Summary

Optional Element Summary

Constructor Summary

Constructor Summary

Profile compact2

pkg2

" - + "pkg2

" - + "pkg4

" - + "pkg2

Packages

pkg4

Package pkg4

Package pkg4

Simple doctitle

Simple doctitle

Simple packages header

pkgDeprecated

Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " + "extends java.lang.Object implements Serializable

Class pkg1.PrivateIncludeInnerClass.PriInnerClass extends " + "java.lang.Object implements Serializable

Class pkg1.ProtectedInnerClass.ProInnerClass extends " + "java.lang.Object implements Serializable

Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " + "extends java.lang.Object implements Serializable

Class " + "pkg1.PrivateIncludeInnerClass.PriInnerClass extends java.lang.Object implements Serializable

Class " + "pkg1.ProtectedInnerClass.ProInnerClass extends java.lang.Object implements Serializable

Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " + "extends java.lang.Object implements Serializable

Class " + "pkg1.PrivateInnerClass.PriInnerClass extends java.lang.Object implements Serializable

Class " + "pkg1.ProtectedInnerClass.ProInnerClass extends java.lang.Object implements Serializable

Class pkg1.PublicExcludeInnerClass.PubInnerClass extends java.lang.Object implements " + "Serializable

Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass " + "extends java.lang.Object implements Serializable

Class pkg1.PrivateInnerClass.PriInnerClass extends " + "java.lang.Object implements Serializable

Class pkg1.ProtectedInnerClass.ProInnerClass extends " + "java.lang.Object implements Serializable

Class pkg1.PublicExcludeInnerClass.PubInnerClass " + "extends java.lang.Object implements Serializable

Method Summary

Method Summary

Package <Unnamed>

Hierarchy For Package <Unnamed>

tag