# HG changeset patch # User jjg # Date 1398213671 25200 # Node ID b0845717434e3925d887bb786e1d77805d8a7165 # Parent 3852ce6db3f452a732f7a4bbfb18e89d560b9c01 8041253: Avoid redundant synonyms of NO_TEST Reviewed-by: ksrini diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/MetaTag/MetaTag.java --- a/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java Tue Apr 22 17:41:11 2014 -0700 @@ -91,9 +91,6 @@ + "content=\"" + m_dateFormat.format(new Date()) + "\">"}, }; - private static final String[][] NEGATED_TEST = NO_TEST; - - private static final String[][] TEST2 = NO_TEST; private static final String[][] NEGATED_TEST2 = { //No keywords when -keywords is not used. { OUTPUT_DIR + "-2/p1/C1.html", @@ -132,8 +129,8 @@ */ public static void main(String[] args) { MetaTag tester = new MetaTag(); - tester.run(ARGS, TEST, NEGATED_TEST); - tester.run(ARGS_NO_TIMESTAMP_NO_KEYWORDS, TEST2, NEGATED_TEST2); + tester.run(ARGS, TEST, NO_TEST); + tester.run(ARGS_NO_TIMESTAMP_NO_KEYWORDS, NO_TEST, NEGATED_TEST2); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java --- a/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java Tue Apr 22 17:41:11 2014 -0700 @@ -97,9 +97,6 @@ "p1", "p2"}; - //Input for string search tests. - private static final String[][] NEGATED_TEST = NO_TEST; - /** * The entry point of the test. * @param args the array of command line arguments. @@ -107,9 +104,9 @@ public static void main(String[] args) { JavadocTester tester = new PackagesHeader(); - tester.run(JAVADOC_ARGS1, TESTARRAY1, NEGATED_TEST); - tester.run(JAVADOC_ARGS2, TESTARRAY2, NEGATED_TEST); - tester.run(JAVADOC_ARGS3, TESTARRAY3, NEGATED_TEST); + tester.run(JAVADOC_ARGS1, TESTARRAY1, NO_TEST); + tester.run(JAVADOC_ARGS2, TESTARRAY2, NO_TEST); + tester.run(JAVADOC_ARGS3, TESTARRAY3, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java --- a/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Tue Apr 22 17:41:11 2014 -0700 @@ -37,7 +37,6 @@ private static final String BUG_ID = "4640745"; private static final String[][] TEST = { {"tmp/pkg1/C1.html", "C2.html"}}; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS1 = new String[] { @@ -54,7 +53,7 @@ public static void main(String[] args) { TestAbsLinkPath tester = new TestAbsLinkPath(); tester.run(ARGS1, NO_TEST, NO_TEST); - tester.run(ARGS2, TEST, NEGATED_TEST); + tester.run(ARGS2, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java --- a/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Tue Apr 22 17:41:11 2014 -0700 @@ -49,16 +49,13 @@ "" } }; - - 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) { TestAnnotationOptional tester = new TestAnnotationOptional(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java --- a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Tue Apr 22 17:41:11 2014 -0700 @@ -38,7 +38,6 @@ private static final String BUG_ID = "4511110"; private static final String[][] TEST = { {BUG_ID + "/C.html", "src-html/C.html#line.7"}}; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-d", BUG_ID, "-sourcepath", SRC_DIR, @@ -50,7 +49,7 @@ */ public static void main(String[] args) { TestBackSlashInLink tester = new TestBackSlashInLink(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java --- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Tue Apr 22 17:41:11 2014 -0700 @@ -43,17 +43,13 @@ "-Xdoclint:none", "-d", BUG_ID, 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 = tester.run(ARGS, TEST, NEGATED_TEST); + int exitCode = tester.run(ARGS, NO_TEST, NO_TEST); tester.checkExitCode(0, exitCode); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java --- a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,8 +36,6 @@ 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, @@ -50,7 +48,7 @@ */ public static void main(String[] args) { TestBaseClass tester = new TestBaseClass(); - if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, NO_TEST, NO_TEST) != 0) { throw new Error("Javadoc failed to execute."); } } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java --- a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Tue Apr 22 17:41:11 2014 -0700 @@ -41,7 +41,6 @@ private static final String[][] TEST = { {BUG_ID + "/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, @@ -53,7 +52,7 @@ */ public static void main(String[] args) { TestBreakIterator tester = new TestBreakIterator(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java --- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Tue Apr 22 17:41:11 2014 -0700 @@ -51,7 +51,6 @@ " Line 2"} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -60,7 +59,7 @@ public static void main(String[] args) throws Exception { initFiles(new File(SRC_DIR), new File("."), "pkg"); TestCRLineSeparator tester = new TestCRLineSeparator(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java --- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Tue Apr 22 17:41:11 2014 -0700 @@ -53,7 +53,6 @@ "
toString in class java.lang.Object
\n" + ""} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-d", BUG_ID, "-sourcepath", SRC_DIR, @@ -66,7 +65,7 @@ */ public static void main(String[] args) { TestClassCrossReferences tester = new TestClassCrossReferences(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java --- a/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java Tue Apr 22 17:41:11 2014 -0700 @@ -38,8 +38,6 @@ private static final String OUTPUT_DIR1 = "4506980-tmp1"; private static final String OUTPUT_DIR2 = "4506980-tmp2"; - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS1 = new String[] { "-d", OUTPUT_DIR1, "-sourcepath", SRC_DIR, @@ -70,8 +68,8 @@ */ public static void main(String[] args) { TestCmndLineClass tester = new TestCmndLineClass(); - tester.run(ARGS1, TEST, NEGATED_TEST); - tester.run(ARGS2, TEST, NEGATED_TEST); + tester.run(ARGS1, NO_TEST, NO_TEST); + tester.run(ARGS2, NO_TEST, NO_TEST); tester.runDiffs(FILES_TO_DIFF); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java --- a/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,7 +36,6 @@ public class TestConstantValuesPage extends JavadocTester { private static final String BUG_ID = "4681599"; - private static final String[][] TEST = NO_TEST; private static final String[][] NEGATED_TEST = { {NOTICE_OUTPUT, "constant-values.html..."} }; @@ -50,7 +49,7 @@ */ public static void main(String[] args) { TestConstantValuesPage tester = new TestConstantValuesPage(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java --- a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Tue Apr 22 17:41:11 2014 -0700 @@ -53,7 +53,6 @@ "" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -61,7 +60,7 @@ */ public static void main(String[] args) { TestConstructorIndent tester = new TestConstructorIndent(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java --- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Tue Apr 22 17:41:11 2014 -0700 @@ -92,15 +92,13 @@ "
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(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java --- a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Tue Apr 22 17:41:11 2014 -0700 @@ -50,8 +50,6 @@ "pkg" }; - private static final String[][] TEST = NO_TEST; - private static final String[][] NEGATED_TEST = { {BUG_ID + "/stylesheet.css", "body {\n" + @@ -64,7 +62,7 @@ */ public static void main(String[] args) { TestDocEncoding tester = new TestDocEncoding(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java --- a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Tue Apr 22 17:41:11 2014 -0700 @@ -44,10 +44,6 @@ 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,7 +53,7 @@ */ public static void main(String[] args) { TestDocErrorReporter tester = new TestDocErrorReporter(); - int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, NO_TEST, NO_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java --- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Tue Apr 22 17:41:11 2014 -0700 @@ -45,7 +45,6 @@ {BUG_ID + "-1/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/pkg/doc-files/subdir-used1" + @@ -64,7 +63,6 @@ {"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 = @@ -95,9 +93,9 @@ public static void main(String[] args) { TestDocFileDir tester = new TestDocFileDir(); copyDir(SRC_DIR + "/pkg", "."); - tester.run(ARGS0, TEST0, NEGATED_TEST0); + tester.run(ARGS0, TEST0, NO_TEST); copyDir(SRC_DIR + "/pkg", BUG_ID + "-1"); - tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS1, TEST1, NO_TEST); tester.run(ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java --- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Tue Apr 22 17:41:11 2014 -0700 @@ -50,7 +50,6 @@ {BUG_ID + "/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}\"", @@ -65,7 +64,7 @@ */ public static void main(String[] args) { TestDocRootInlineTag tester = new TestDocRootInlineTag(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java --- a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,7 +36,6 @@ 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 @@ -60,7 +59,7 @@ */ public static void main(String[] args) { TestEmptyClass tester = new TestEmptyClass(); - int exitCode = tester.run(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"); diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java --- a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Tue Apr 22 17:41:11 2014 -0700 @@ -46,7 +46,6 @@ private static final String[][] TEST = { {BUG_ID + "/pkg/MyClass.MyInterface.html", "Enclosing class:"} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -54,7 +53,7 @@ */ public static void main(String[] args) { TestEnclosingClass tester = new TestEnclosingClass(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java --- a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,7 +36,6 @@ 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 = { @@ -54,7 +53,7 @@ */ public static void main(String[] args) { TestEncoding tester = new TestEncoding(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java --- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Tue Apr 22 17:41:11 2014 -0700 @@ -50,10 +50,6 @@ "DataInput"}}; - - - private static final String[][] NEGATED_TEST = NO_TEST; - private static final String[] ARGS = new String[] { "-d", BUG_ID, "-sourcepath", SRC_DIR, @@ -67,7 +63,7 @@ */ public static void main(String[] args) { TestExternalOverridenMethod tester = new TestExternalOverridenMethod(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java --- a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Tue Apr 22 17:41:11 2014 -0700 @@ -56,11 +56,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,12 +67,12 @@ public static void main(String[] args) { //Make sure the warning is not printed when -group is used correctly. TestGroupOption tester = new TestGroupOption(); - tester.run(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(); - tester.run(ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS2, TEST2, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java --- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Apr 22 17:41:11 2014 -0700 @@ -108,10 +108,8 @@ // Overview Summary {BUG_ID + "/overview-summary.html", "Overview" - }, - + } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -119,7 +117,7 @@ */ public static void main(String[] args) { TestHeadings tester = new TestHeadings(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java --- a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Tue Apr 22 17:41:11 2014 -0700 @@ -42,8 +42,6 @@ SRC_DIR + "/TestHelpFile.java" }; - private static final String[][] NEGATED_TEST = NO_TEST; - private static final String[][] TEST = { {BUG_ID + "/help-doc.html", "Constant Field Values" @@ -56,7 +54,7 @@ */ public static void main(String[] args) { TestHelpFile tester = new TestHelpFile(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java --- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Tue Apr 22 17:41:11 2014 -0700 @@ -86,14 +86,12 @@ {STANDARD_OUTPUT, "-stylesheetfile "}, {STANDARD_OUTPUT, "-docencoding "}, }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[][] TEST2 = { {BUG_ID + "/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,9 +102,9 @@ */ public static void main(String[] args) { TestHelpOption tester = new TestHelpOption(); - int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, TEST, NO_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); - tester.run(ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS2, TEST2, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java --- a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,7 +36,6 @@ 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). @@ -56,7 +55,7 @@ */ public static void main(String[] args) { TestHiddenMembers tester = new TestHiddenMembers(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java --- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,8 +36,6 @@ 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"}; @@ -48,7 +46,7 @@ */ public static void main(String[] args) { TestHrefInDocComment tester = new TestHrefInDocComment(); - if (tester.run(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."); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java --- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 22 17:41:11 2014 -0700 @@ -44,7 +44,6 @@ }; //Input for string search tests. - private static final String[][] TEST = NO_TEST; private static final String[][] NEGATED_TEST = { {BUG_ID + "/C.html", ""} @@ -56,7 +55,7 @@ */ public static void main(String[] args) { TestHtmlComments tester = new TestHtmlComments(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java --- a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Tue Apr 22 17:41:11 2014 -0700 @@ -425,7 +425,6 @@ ">Description" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -433,7 +432,7 @@ */ public static void main(String[] args) { TestHtmlTableTags tester = new TestHtmlTableTags(); - tester.run(ARGS, TABLE_TAGS_TEST, NEGATED_TEST); + tester.run(ARGS, TABLE_TAGS_TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java --- a/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java Tue Apr 22 17:41:11 2014 -0700 @@ -51,7 +51,6 @@ "\n" + " throws java.lang.Exception" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -59,7 +58,7 @@ */ public static void main(String[] args) { TestIndentation tester = new TestIndentation(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testIndex/TestIndex.java --- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Tue Apr 22 17:41:11 2014 -0700 @@ -81,7 +81,6 @@ "
     
    \n" + ""}, }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -89,7 +88,7 @@ */ public static void main(String[] args) { TestIndex tester = new TestIndex(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java --- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java Tue Apr 22 17:41:11 2014 -0700 @@ -44,7 +44,6 @@ {BUG_ID + "/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"}; @@ -55,7 +54,7 @@ */ public static void main(String[] args) { TestInlineLinkLabel tester = new TestInlineLinkLabel(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java --- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Tue Apr 22 17:41:11 2014 -0700 @@ -114,15 +114,13 @@ " }"}, }; - 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(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java --- a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java Tue Apr 22 17:41:11 2014 -0700 @@ -48,7 +48,6 @@ " 6\n" + " 7"} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-d", BUG_ID, "-sourcepath", SRC_DIR, @@ -60,7 +59,7 @@ */ public static void main(String[] args) { LeadingSpaces tester = new LeadingSpaces(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java --- a/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Tue Apr 22 17:41:11 2014 -0700 @@ -51,15 +51,13 @@ "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(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); if (tester.getErrorOutput().contains("NullPointerException")) { throw new AssertionError("javadoc threw NullPointerException"); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java --- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Tue Apr 22 17:41:11 2014 -0700 @@ -86,7 +86,6 @@ "title=\"class or interface in pkg\">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 @@ -122,7 +121,8 @@ public static void main(String[] args) { TestLinkOption tester = new TestLinkOption(); tester.run(ARGS1, TEST1, NEGATED_TEST1); - tester.run(ARGS2, TEST2, NEGATED_TEST2); + 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(); diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java --- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java Tue Apr 22 17:41:11 2014 -0700 @@ -40,7 +40,6 @@ {BUG_ID + "/serialized-form.html", ""}, {BUG_ID + "/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"}; @@ -51,7 +50,7 @@ */ public static void main(String[] args) { TestLinkToSerialForm tester = new TestLinkToSerialForm(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java --- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java Tue Apr 22 17:41:11 2014 -0700 @@ -89,15 +89,13 @@ " 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(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java --- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Tue Apr 22 17:41:11 2014 -0700 @@ -67,7 +67,6 @@ "" }, }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -75,7 +74,7 @@ */ public static void main(String[] args) { TestMemberSummary tester = new TestMemberSummary(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testModifier/TestModifier.java --- a/langtools/test/com/sun/javadoc/testModifier/TestModifier.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testModifier/TestModifier.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,8 +36,6 @@ public class TestModifier extends JavadocTester { private static final String BUG_ID = "4210388"; - 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, @@ -50,7 +48,7 @@ */ public static void main(String[] args) { TestModifier tester = new TestModifier(); - if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, NO_TEST, NO_TEST) != 0) { throw new Error("Javadoc error occured during execution."); } } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java --- a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java Tue Apr 22 17:41:11 2014 -0700 @@ -65,7 +65,6 @@ "\n" + ""} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -73,7 +72,7 @@ */ public static void main(String[] args) { TestNavigation tester = new TestNavigation(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java --- a/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Tue Apr 22 17:41:11 2014 -0700 @@ -50,7 +50,6 @@ "(java.util.Map<A, java.util.Map<A, A>>)" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -58,7 +57,7 @@ */ public static void main(String[] args) { TestNestedGenerics tester = new TestNestedGenerics(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java --- a/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java Tue Apr 22 17:41:11 2014 -0700 @@ -77,7 +77,6 @@ } }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-d", BUG_ID, "-sourcepath", SRC_DIR, @@ -93,7 +92,7 @@ */ public static void main(String[] args) { TestNestedInlineTag tester = new TestNestedInlineTag(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testOptions/TestOptions.java --- a/langtools/test/com/sun/javadoc/testOptions/TestOptions.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOptions/TestOptions.java Tue Apr 22 17:41:11 2014 -0700 @@ -49,15 +49,13 @@ "
    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(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java --- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Tue Apr 22 17:41:11 2014 -0700 @@ -51,7 +51,6 @@ "BaseClass" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -59,7 +58,7 @@ */ public static void main(String[] args) { TestOverridenMethodDocCopy tester = new TestOverridenMethodDocCopy(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java --- a/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Tue Apr 22 17:41:11 2014 -0700 @@ -57,8 +57,6 @@ "
  • 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/overview-summary.html", "pkg1"}, {BUG_ID + "-2/allclasses-frame.html", "FooDepr"} @@ -70,8 +68,8 @@ */ public static void main(String[] args) { TestPackageDeprecation tester = new TestPackageDeprecation(); - tester.run(ARGS1, TEST1, NEGATED_TEST1); - tester.run(ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS1, TEST1, NO_TEST); + tester.run(ARGS2, NO_TEST, NEGATED_TEST2); if ((new java.io.File(BUG_ID + "-2/pkg1/" + "package-summary.html")).exists()) { throw new Error("Test Fails: packages summary should not be" + diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java --- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Tue Apr 22 17:41:11 2014 -0700 @@ -67,7 +67,6 @@ }, }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -75,7 +74,7 @@ */ public static void main(String[] args) { TestParamTaglet tester = new TestParamTaglet(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java --- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Tue Apr 22 17:41:11 2014 -0700 @@ -96,10 +96,7 @@ //PACKAGE OVERVIEW {BUG_ID + "/overview-summary.html", "relative package link"}, - - }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -107,7 +104,7 @@ */ public static void main(String[] args) { TestRelativeLinks tester = new TestRelativeLinks(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java --- a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java Tue Apr 22 17:41:11 2014 -0700 @@ -48,7 +48,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. @@ -63,7 +62,7 @@ */ public static void main(String[] args) { TestReturnTag tester = new TestReturnTag(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java --- a/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java Tue Apr 22 17:41:11 2014 -0700 @@ -49,7 +49,6 @@ private static final String[][] TEST = { {OUTPUT_DIR + "/serialized-form.html", "-111111111111111L"} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -57,7 +56,7 @@ */ public static void main(String[] args) { TestSerialVersionUID tester = new TestSerialVersionUID(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java --- a/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java Tue Apr 22 17:41:11 2014 -0700 @@ -36,7 +36,6 @@ 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 + "/DummyClass.html", "todo"} }; @@ -51,7 +50,7 @@ */ public static void main(String[] args) { TestSimpleTagExclude tester = new TestSimpleTagExclude(); - if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, NO_TEST, NEGATED_TEST) != 0) { throw new Error("Javadoc failed to execute."); } tester.printSummary(); diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java --- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Tue Apr 22 17:41:11 2014 -0700 @@ -52,7 +52,6 @@ "
    Custom:
    \n" + "
    doc for BaseClass method
    " } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -60,7 +59,7 @@ */ public static void main(String[] args) { TestSimpleTagInherit tester = new TestSimpleTagInherit(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java --- a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java Tue Apr 22 17:41:11 2014 -0700 @@ -41,8 +41,6 @@ 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; //Run Javadoc on a source file with that is indented with a single tab per line private static final String[] ARGS1 = @@ -77,8 +75,8 @@ */ public static void main(String[] args) throws IOException { TestSourceTab tester = new TestSourceTab(); - tester.run(ARGS1, TEST, NEGATED_TEST); - tester.run(ARGS2, TEST, NEGATED_TEST); + tester.run(ARGS1, NO_TEST, NO_TEST); + tester.run(ARGS2, NO_TEST, NO_TEST); tester.runDiffs(FILES_TO_DIFF); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java --- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Tue Apr 22 17:41:11 2014 -0700 @@ -48,7 +48,6 @@ private static final String[][] TEST = { {BUG_ID + "/C.html", "

    Method Summary

    "} }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -56,7 +55,7 @@ */ public static void main(String[] args) { TestSummaryHeading tester = new TestSummaryHeading(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java --- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java Tue Apr 22 17:41:11 2014 -0700 @@ -42,7 +42,6 @@ "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" }; @@ -53,7 +52,7 @@ */ public static void main(String[] args) { TestSuperClassInSerialForm tester = new TestSuperClassInSerialForm(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java --- a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java Tue Apr 22 17:41:11 2014 -0700 @@ -39,7 +39,6 @@ {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 + "/TestTagMisuse.java" }; @@ -50,7 +49,7 @@ */ public static void main(String[] args) { TestTagMisuse tester = new TestTagMisuse(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java --- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java Tue Apr 22 17:41:11 2014 -0700 @@ -59,13 +59,11 @@ "
    my only method is here" + "
    "} }; - private static final String[][] NEGATED_TEST_4654308 = NO_TEST; private static final String[][] TEST_4767038 = new String[][] { {"4767038/Child.html", "This is the first sentence."} }; - private static final String[][] NEGATED_TEST_4767038 = NO_TEST; /** @@ -74,10 +72,10 @@ */ public static void main(String[] args) { TestTaglets tester = new TestTaglets(); - tester.run(ARGS_4654308, TEST_4654308, NEGATED_TEST_4654308); + tester.run(ARGS_4654308, TEST_4654308, NO_TEST); tester.printSummary(); tester = new TestTaglets(); - tester.run(ARGS_4767038, TEST_4767038, NEGATED_TEST_4767038); + tester.run(ARGS_4767038, TEST_4767038, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java --- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Tue Apr 22 17:41:11 2014 -0700 @@ -40,7 +40,6 @@ private static final String[][] TEST = { {BUG_ID + "/C.html", "
    Throws:"} }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-d", BUG_ID, SRC_DIR + "/C.java" }; @@ -51,7 +50,7 @@ */ public static void main(String[] args) { TestThrowsHead tester = new TestThrowsHead(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java --- a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java Tue Apr 22 17:41:11 2014 -0700 @@ -56,7 +56,6 @@ "
    T8 - the fourth inherited throws tag.
    " }, }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -64,7 +63,7 @@ */ public static void main(String[] args) { TestThrowsTag tester = new TestThrowsTag(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java --- a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java Tue Apr 22 17:41:11 2014 -0700 @@ -51,7 +51,6 @@ }; - private static final String[][] NEGATED_TEST = NO_TEST; private static final String[] ARGS = new String[] { "-d", BUG_ID, "-sourcepath", SRC_DIR, "-linkoffline", "http://java.sun.com/j2se/1.4/docs/api", @@ -64,7 +63,7 @@ */ public static void main(String[] args) { TestTitleInHref tester = new TestTitleInHref(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java --- a/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java Tue Apr 22 17:41:11 2014 -0700 @@ -70,7 +70,6 @@ {BUG_ID + "/help-doc.html", "TOP TEXT"}, }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -78,7 +77,7 @@ */ public static void main(String[] args) { TestTopOption tester = new TestTopOption(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java --- a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Tue Apr 22 17:41:11 2014 -0700 @@ -43,7 +43,6 @@ }; //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 + "/typeannos/MyClass.html", @@ -383,7 +382,7 @@ */ public static void main(String[] args) { TestTypeAnnotations tester = new TestTypeAnnotations(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java --- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java Tue Apr 22 17:41:11 2014 -0700 @@ -84,7 +84,6 @@ "Foo4>>>" } }; - private static final String[][] NEGATED_TEST = NO_TEST; /** * The entry point of the test. @@ -92,8 +91,8 @@ */ public static void main(String[] args) { TestTypeParameters tester = new TestTypeParameters(); - tester.run(ARGS1, TEST1, NEGATED_TEST); - tester.run(ARGS2, TEST2, NEGATED_TEST); + tester.run(ARGS1, TEST1, NO_TEST); + tester.run(ARGS2, TEST2, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java --- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java Tue Apr 22 17:41:11 2014 -0700 @@ -41,7 +41,6 @@ {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 + "/C.java" }; @@ -52,7 +51,7 @@ */ public static void main(String[] args) { TestWarnBadParamNames tester = new TestWarnBadParamNames(); - tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java --- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java Tue Apr 22 17:41:11 2014 -0700 @@ -74,9 +74,6 @@ "f
    "}, }; - private static final String[][] NEGATED_TEST2 = NO_TEST; - - /** * The entry point of the test. * @param args the array of command line arguments. @@ -84,7 +81,8 @@ public static void main(String[] args) { TestWarnings tester = new TestWarnings(); tester.run(ARGS, TEST, NEGATED_TEST); - tester.run(ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS2, TEST2, NO_TEST); tester.printSummary(); } diff -r 3852ce6db3f4 -r b0845717434e langtools/test/com/sun/javadoc/testXOption/TestXOption.java --- a/langtools/test/com/sun/javadoc/testXOption/TestXOption.java Tue Apr 22 15:59:33 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testXOption/TestXOption.java Tue Apr 22 17:41:11 2014 -0700 @@ -53,7 +53,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,7 +63,7 @@ */ public static void main(String[] args) { TestXOption tester = new TestXOption(); - int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, TEST, NO_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); tester.printSummary(); }