OpenJDK / amber / amber
changeset 24065:fc4022e50129
8041150: Avoid silly use of static methods in JavadocTester
Reviewed-by: ksrini
line wrap: on
line diff
--- a/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java Fri Apr 18 17:25:43 2014 -0700 @@ -67,7 +67,7 @@ */ public static void main(String[] args) { JavadocTester tester = new AccessSummary(); - run(tester, JAVADOC_ARGS, TESTARRAY1, new String[][] {}); + tester.run(JAVADOC_ARGS, TESTARRAY1, new String[][] {}); tester.printSummary(); // Necessary for string search }
--- a/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -132,8 +132,8 @@ */ public static void main(String[] args) { MetaTag tester = new MetaTag(); - run(tester, ARGS, TEST, NEGATED_TEST); - run(tester, ARGS_NO_TIMESTAMP_NO_KEYWORDS, TEST2, NEGATED_TEST2); + tester.run(ARGS, TEST, NEGATED_TEST); + tester.run(ARGS_NO_TIMESTAMP_NO_KEYWORDS, TEST2, NEGATED_TEST2); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java Fri Apr 18 17:25:43 2014 -0700 @@ -107,9 +107,9 @@ public static void main(String[] args) { JavadocTester tester = new PackagesHeader(); - run(tester, JAVADOC_ARGS1, TESTARRAY1, NEGATED_TEST); - run(tester, JAVADOC_ARGS2, TESTARRAY2, NEGATED_TEST); - run(tester, JAVADOC_ARGS3, TESTARRAY3, NEGATED_TEST); + tester.run(JAVADOC_ARGS1, TESTARRAY1, NEGATED_TEST); + tester.run(JAVADOC_ARGS2, TESTARRAY2, NEGATED_TEST); + tester.run(JAVADOC_ARGS3, TESTARRAY3, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/_template/Template.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/_template/Template.java Fri Apr 18 17:25:43 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 @@ -52,7 +52,7 @@ */ public static void main(String[] args) { Template tester = new Template(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/_template/TemplateComplete.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/_template/TemplateComplete.java Fri Apr 18 17:25:43 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 @@ -59,7 +59,7 @@ */ public static void main(String[] args) { TemplateComplete tester = new TemplateComplete(); - int actualExitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); tester.runDiffs(FILES_TO_DIFF, false); tester.printSummary();
--- a/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java Fri Apr 18 17:25:43 2014 -0700 @@ -53,7 +53,7 @@ tests[tests.length-1][0] = BUG_ID + "/constant-values.html"; tests[tests.length-1][1] = "<code>\"<Hello World>\"</code>"; TestConstantValuesDriver tester = new TestConstantValuesDriver(); - run(tester, ARGS, tests, NO_TEST); + tester.run(ARGS, tests, NO_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java Fri Apr 18 17:25:43 2014 -0700 @@ -49,7 +49,7 @@ tests[i][1] = "Test "+(i+1)+" passes"; } TestDupThrowsTags tester = new TestDupThrowsTags(); - run(tester, ARGS, tests, NO_TEST); + tester.run(ARGS, tests, NO_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/lib/JavadocTester.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/lib/JavadocTester.java Fri Apr 18 17:25:43 2014 -0700 @@ -145,23 +145,21 @@ /** * Execute the tests. * - * @param tester the tester to execute * @param args the arguments to pass to Javadoc * @param testArray the array of tests * @param negatedTestArray the array of negated tests * @return the return code for the execution of Javadoc */ - public static int run(JavadocTester tester, String[] args, + public int run(String[] args, String[][] testArray, String[][] negatedTestArray) { - int returnCode = tester.runJavadoc(args); - tester.runTestsOnHTML(testArray, negatedTestArray); + int returnCode = runJavadoc(args); + runTestsOnHTML(testArray, negatedTestArray); return returnCode; } /** * Execute the tests. * - * @param tester the tester to execute * @param args the arguments to pass to Javadoc * @param testArray the array of tests * @param negatedTestArray the array of negated tests @@ -169,12 +167,12 @@ * @param negatedFileTestArray the array of negated file tests * @return the return code for the execution of Javadoc */ - public static int run(JavadocTester tester, String[] args, - String[][] testArray, String[][] negatedTestArray, String[] fileTestArray, - String[] negatedFileTestArray) { - int returnCode = tester.runJavadoc(args); - tester.runTestsOnHTML(testArray, negatedTestArray); - tester.runTestsOnFile(fileTestArray, negatedFileTestArray); + public int run(String[] args, + String[][] testArray, String[][] negatedTestArray, + String[] fileTestArray, String[] negatedFileTestArray) { + int returnCode = runJavadoc(args); + runTestsOnHTML(testArray, negatedTestArray); + runTestsOnFile(fileTestArray, negatedFileTestArray); return returnCode; }
--- a/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Fri Apr 18 17:25:43 2014 -0700 @@ -53,8 +53,8 @@ */ public static void main(String[] args) { TestAbsLinkPath tester = new TestAbsLinkPath(); - run(tester, ARGS1, NO_TEST, NO_TEST); - run(tester, ARGS2, TEST, NEGATED_TEST); + tester.run(ARGS1, NO_TEST, NO_TEST); + tester.run(ARGS2, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java Fri Apr 18 17:25:43 2014 -0700 @@ -101,7 +101,7 @@ */ public static void main(String[] args) { TestAbstractMethod tester = new TestAbstractMethod(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java Fri Apr 18 17:25:43 2014 -0700 @@ -270,7 +270,7 @@ */ public static void main(String[] args) throws Exception { TestAnchorNames tester = new TestAnchorNames(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java Fri Apr 18 17:25:43 2014 -0700 @@ -58,7 +58,7 @@ */ public static void main(String[] args) { TestAnnotationOptional tester = new TestAnnotationOptional(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java Fri Apr 18 17:25:43 2014 -0700 @@ -87,7 +87,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(); }
--- a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Fri Apr 18 17:25:43 2014 -0700 @@ -50,7 +50,7 @@ */ public static void main(String[] args) { TestBackSlashInLink tester = new TestBackSlashInLink(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java Fri Apr 18 17:25:43 2014 -0700 @@ -57,7 +57,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(); }
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Fri Apr 18 17:25:43 2014 -0700 @@ -53,7 +53,7 @@ */ public static void main(String[] args) { TestBadSourceFile tester = new TestBadSourceFile(); - int exitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int exitCode = tester.run(ARGS, TEST, NEGATED_TEST); tester.checkExitCode(0, exitCode); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Fri Apr 18 17:25:43 2014 -0700 @@ -50,7 +50,7 @@ */ public static void main(String[] args) { TestBaseClass tester = new TestBaseClass(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { throw new Error("Javadoc failed to execute."); } }
--- a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Fri Apr 18 17:25:43 2014 -0700 @@ -53,7 +53,7 @@ */ public static void main(String[] args) { TestBreakIterator tester = new TestBreakIterator(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Fri Apr 18 17:25:43 2014 -0700 @@ -60,7 +60,7 @@ 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, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Fri Apr 18 17:25:43 2014 -0700 @@ -62,7 +62,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(); }
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Fri Apr 18 17:25:43 2014 -0700 @@ -66,7 +66,7 @@ */ public static void main(String[] args) { TestClassCrossReferences tester = new TestClassCrossReferences(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java Fri Apr 18 17:25:43 2014 -0700 @@ -89,7 +89,7 @@ */ public static void main(String[] args) { TestClassTree tester = new TestClassTree(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java Fri Apr 18 17:25:43 2014 -0700 @@ -70,8 +70,8 @@ */ public static void main(String[] args) { TestCmndLineClass tester = new TestCmndLineClass(); - run(tester, ARGS1, TEST, NEGATED_TEST); - run(tester, ARGS2, TEST, NEGATED_TEST); + tester.run(ARGS1, TEST, NEGATED_TEST); + tester.run(ARGS2, TEST, NEGATED_TEST); tester.runDiffs(FILES_TO_DIFF); }
--- a/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java Fri Apr 18 17:25:43 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 @@ -53,7 +53,7 @@ */ public static void main(String[] args) throws Exception { TestCompletionFailure tester = new TestCompletionFailure(); - run(tester, ARGS, NO_TEST, NEGATED_TEST); + tester.run(ARGS, NO_TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java Fri Apr 18 17:25:43 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 @@ -50,7 +50,7 @@ */ public static void main(String[] args) { TestConstantValuesPage tester = new TestConstantValuesPage(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java Fri Apr 18 17:25:43 2014 -0700 @@ -61,7 +61,7 @@ */ public static void main(String[] args) { TestConstructorIndent tester = new TestConstructorIndent(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java Fri Apr 18 17:25:43 2014 -0700 @@ -127,7 +127,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(); }
--- a/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -88,10 +88,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(); }
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Fri Apr 18 17:25:43 2014 -0700 @@ -100,7 +100,7 @@ */ public static void main(String[] args) { TestDeprecatedDocs tester = new TestDeprecatedDocs(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Fri Apr 18 17:25:43 2014 -0700 @@ -64,7 +64,7 @@ */ public static void main(String[] args) { TestDocEncoding tester = new TestDocEncoding(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Fri Apr 18 17:25:43 2014 -0700 @@ -57,7 +57,7 @@ */ public static void main(String[] args) { TestDocErrorReporter tester = new TestDocErrorReporter(); - int actualExitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Fri Apr 18 17:25:43 2014 -0700 @@ -95,10 +95,10 @@ public static void main(String[] args) { TestDocFileDir tester = new TestDocFileDir(); copyDir(SRC_DIR + "/pkg", "."); - run(tester, ARGS0, TEST0, NEGATED_TEST0); + tester.run(ARGS0, TEST0, NEGATED_TEST0); copyDir(SRC_DIR + "/pkg", BUG_ID + "-1"); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Fri Apr 18 17:25:43 2014 -0700 @@ -47,7 +47,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(); }
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -65,7 +65,7 @@ */ public static void main(String[] args) { TestDocRootInlineTag tester = new TestDocRootInlineTag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Fri Apr 18 17:25:43 2014 -0700 @@ -128,8 +128,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(); }
--- a/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java Fri Apr 18 17:25:43 2014 -0700 @@ -48,7 +48,9 @@ * @param args the array of command line arguments. */ public static void main(String[] args) { - run(new TestDupParamWarn(), ARGS, NO_TEST, NEGATED_TEST); + JavadocTester tester = new TestDupParamWarn(); + tester.run(ARGS, NO_TEST, NEGATED_TEST); + tester.printSummary(); } /**
--- a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Fri Apr 18 17:25:43 2014 -0700 @@ -60,7 +60,7 @@ */ public static void main(String[] args) { TestEmptyClass tester = new TestEmptyClass(); - int exitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int exitCode = tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); if (exitCode != 0) { throw new Error("Error found while executing Javadoc");
--- a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Fri Apr 18 17:25:43 2014 -0700 @@ -54,7 +54,7 @@ */ public static void main(String[] args) { TestEnclosingClass tester = new TestEnclosingClass(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Fri Apr 18 17:25:43 2014 -0700 @@ -54,7 +54,7 @@ */ public static void main(String[] args) { TestEncoding tester = new TestEncoding(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Fri Apr 18 17:25:43 2014 -0700 @@ -67,7 +67,7 @@ */ public static void main(String[] args) { TestExternalOverridenMethod tester = new TestExternalOverridenMethod(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Fri Apr 18 17:25:43 2014 -0700 @@ -100,8 +100,8 @@ */ 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");
--- a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Fri Apr 18 17:25:43 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 @@ -69,12 +69,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, TEST1, 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, NEGATED_TEST2); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Fri Apr 18 17:25:43 2014 -0700 @@ -119,7 +119,7 @@ */ public static void main(String[] args) { TestHeadings tester = new TestHeadings(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Fri Apr 18 17:25:43 2014 -0700 @@ -56,7 +56,7 @@ */ public static void main(String[] args) { TestHelpFile tester = new TestHelpFile(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Fri Apr 18 17:25:43 2014 -0700 @@ -104,9 +104,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, NEGATED_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS2, TEST2, NEGATED_TEST2); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Fri Apr 18 17:25:43 2014 -0700 @@ -56,7 +56,7 @@ */ public static void main(String[] args) { TestHiddenMembers tester = new TestHiddenMembers(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Fri Apr 18 17:25:43 2014 -0700 @@ -95,7 +95,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(); }
--- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Fri Apr 18 17:25:43 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 @@ -48,7 +48,7 @@ */ public static void main(String[] args) { TestHrefInDocComment tester = new TestHrefInDocComment(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { throw new Error("Javadoc failed to execute properly with given source."); }
--- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Fri Apr 18 17:25:43 2014 -0700 @@ -56,7 +56,7 @@ */ public static void main(String[] args) { TestHtmlComments tester = new TestHtmlComments(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -355,14 +355,14 @@ */ public static void main(String[] args) { TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag(); - 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(); }
--- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -65,8 +65,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(); }
--- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java Fri Apr 18 17:25:43 2014 -0700 @@ -90,7 +90,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(); }
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java Fri Apr 18 17:25:43 2014 -0700 @@ -433,7 +433,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, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -73,9 +73,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(); }
--- a/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java Fri Apr 18 17:25:43 2014 -0700 @@ -59,7 +59,7 @@ */ public static void main(String[] args) { TestIndentation tester = new TestIndentation(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java Fri Apr 18 17:25:43 2014 -0700 @@ -89,7 +89,7 @@ */ public static void main(String[] args) { TestIndex tester = new TestIndex(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java Fri Apr 18 17:25:43 2014 -0700 @@ -55,7 +55,7 @@ */ public static void main(String[] args) { TestInlineLinkLabel tester = new TestInlineLinkLabel(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java Fri Apr 18 17:25:43 2014 -0700 @@ -126,7 +126,7 @@ */ public static void main(String[] args) { TestInterface tester = new TestInterface(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java Fri Apr 18 17:25:43 2014 -0700 @@ -94,7 +94,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(); }
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java Fri Apr 18 17:25:43 2014 -0700 @@ -122,7 +122,7 @@ */ public static void main(String[] args) { TestJavascript tester = new TestJavascript(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java Fri Apr 18 17:25:43 2014 -0700 @@ -114,8 +114,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(); }
--- a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java Fri Apr 18 17:25:43 2014 -0700 @@ -60,7 +60,7 @@ */ public static void main(String[] args) { LeadingSpaces tester = new LeadingSpaces(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java Fri Apr 18 17:25:43 2014 -0700 @@ -59,7 +59,7 @@ */ public static void main(String[] args) { TestLegacyTaglet tester = new TestLegacyTaglet(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); if (tester.getErrorOutput().contains("NullPointerException")) { throw new AssertionError("javadoc threw NullPointerException"); }
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java Fri Apr 18 17:25:43 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 @@ -55,7 +55,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(); }
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java Fri Apr 18 17:25:43 2014 -0700 @@ -121,8 +121,8 @@ */ 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(ARGS2, TEST2, NEGATED_TEST2); tester.runJavadoc(createArguments(true)); // with trailing slash tester.runJavadoc(createArguments(false)); // without trailing slash tester.printSummary();
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java Fri Apr 18 17:25:43 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 @@ -53,7 +53,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(); }
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java Fri Apr 18 17:25:43 2014 -0700 @@ -76,7 +76,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(); }
--- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java Fri Apr 18 17:25:43 2014 -0700 @@ -51,7 +51,7 @@ */ public static void main(String[] args) { TestLinkToSerialForm tester = new TestLinkToSerialForm(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java Fri Apr 18 17:25:43 2014 -0700 @@ -97,7 +97,7 @@ */ public static void main(String[] args) { TestLiteralCodeInPre tester = new TestLiteralCodeInPre(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Apr 18 17:25:43 2014 -0700 @@ -105,7 +105,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(); }
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java Fri Apr 18 17:25:43 2014 -0700 @@ -75,7 +75,7 @@ */ public static void main(String[] args) { TestMemberSummary tester = new TestMemberSummary(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java Fri Apr 18 17:25:43 2014 -0700 @@ -119,7 +119,7 @@ */ public static void main(String[] args) { TestMethodTypes tester = new TestMethodTypes(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testModifier/TestModifier.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testModifier/TestModifier.java Fri Apr 18 17:25:43 2014 -0700 @@ -50,7 +50,7 @@ */ public static void main(String[] args) { TestModifier tester = new TestModifier(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { throw new Error("Javadoc error occured during execution."); } }
--- a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java Fri Apr 18 17:25:43 2014 -0700 @@ -73,7 +73,7 @@ */ public static void main(String[] args) { TestNavigation tester = new TestNavigation(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java Fri Apr 18 17:25:43 2014 -0700 @@ -58,7 +58,7 @@ */ public static void main(String[] args) { TestNestedGenerics tester = new TestNestedGenerics(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -93,7 +93,7 @@ */ public static void main(String[] args) { TestNestedInlineTag tester = new TestNestedInlineTag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Apr 18 17:25:43 2014 -0700 @@ -763,7 +763,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(); }
--- a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java Fri Apr 18 17:25:43 2014 -0700 @@ -50,7 +50,7 @@ */ public static void main(String[] args) { TestNoPackagesFile tester = new TestNoPackagesFile(); - run(tester, ARGS, NO_TEST, NO_TEST); + tester.run(ARGS, NO_TEST, NO_TEST); if ((new java.io.File(BUG_ID + "/packages.html")).exists()) { throw new Error("Test Fails: packages file should not be " + "generated anymore."); } else {
--- a/langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java Fri Apr 18 17:25:43 2014 -0700 @@ -51,7 +51,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(); }
--- a/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java Fri Apr 18 17:25:43 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 @@ -67,12 +67,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(); }
--- a/langtools/test/com/sun/javadoc/testOptions/TestOptions.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOptions/TestOptions.java Fri Apr 18 17:25:43 2014 -0700 @@ -57,7 +57,7 @@ */ public static void main(String[] args) { TestOptions tester = new TestOptions(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java Fri Apr 18 17:25:43 2014 -0700 @@ -82,7 +82,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(); }
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java Fri Apr 18 17:25:43 2014 -0700 @@ -59,7 +59,7 @@ */ public static void main(String[] args) { TestOverridenMethodDocCopy tester = new TestOverridenMethodDocCopy(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java Fri Apr 18 17:25:43 2014 -0700 @@ -83,7 +83,7 @@ */ public static void main(String[] args) { TestOverridenPrivateMethods tester = new TestOverridenPrivateMethods(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java Fri Apr 18 17:25:43 2014 -0700 @@ -90,7 +90,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(); }
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java Fri Apr 18 17:25:43 2014 -0700 @@ -86,7 +86,7 @@ */ public static void main(String[] args) { TestOverridenPrivateMethodsWithPrivateFlag tester = new TestOverridenPrivateMethodsWithPrivateFlag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java Fri Apr 18 17:25:43 2014 -0700 @@ -70,8 +70,8 @@ */ public static void main(String[] args) { TestPackageDeprecation tester = new TestPackageDeprecation(); - run(tester, ARGS1, TEST1, NEGATED_TEST1); - run(tester, ARGS2, TEST2, NEGATED_TEST2); + tester.run(ARGS1, TEST1, NEGATED_TEST1); + tester.run(ARGS2, TEST2, 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" +
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java Fri Apr 18 17:25:43 2014 -0700 @@ -90,8 +90,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(); }
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java Fri Apr 18 17:25:43 2014 -0700 @@ -75,7 +75,7 @@ */ public static void main(String[] args) { TestParamTaglet tester = new TestParamTaglet(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java Fri Apr 18 17:25:43 2014 -0700 @@ -269,8 +269,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(); }
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java Fri Apr 18 17:25:43 2014 -0700 @@ -282,8 +282,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(); }
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java Fri Apr 18 17:25:43 2014 -0700 @@ -114,9 +114,9 @@ */ 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(); }
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java Fri Apr 18 17:25:43 2014 -0700 @@ -55,7 +55,7 @@ {BUG_ID + "/allclasses-frame.html", "DummyClass.html"} }; TestRecurseSubPackages tester = new TestRecurseSubPackages(); - run(tester, ARGS, tests, negatedTests); + tester.run(ARGS, tests, negatedTests); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Fri Apr 18 17:25:43 2014 -0700 @@ -107,7 +107,7 @@ */ public static void main(String[] args) { TestRelativeLinks tester = new TestRelativeLinks(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java Fri Apr 18 17:25:43 2014 -0700 @@ -167,7 +167,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(); }
--- a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -63,7 +63,7 @@ */ public static void main(String[] args) { TestReturnTag tester = new TestReturnTag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -60,7 +60,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(); }
--- a/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java Fri Apr 18 17:25:43 2014 -0700 @@ -57,7 +57,7 @@ */ public static void main(String[] args) { TestSerialVersionUID tester = new TestSerialVersionUID(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java Fri Apr 18 17:25:43 2014 -0700 @@ -132,8 +132,8 @@ */ 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(); }
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Apr 18 17:25:43 2014 -0700 @@ -138,10 +138,10 @@ */ public static void main(String[] args) { TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo(); - 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(); }
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -66,7 +66,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(); }
--- a/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java Fri Apr 18 17:25:43 2014 -0700 @@ -51,7 +51,7 @@ */ public static void main(String[] args) { TestSimpleTagExclude tester = new TestSimpleTagExclude(); - if (run(tester, ARGS, TEST, NEGATED_TEST) != 0) { + if (tester.run(ARGS, TEST, NEGATED_TEST) != 0) { throw new Error("Javadoc failed to execute."); } tester.printSummary();
--- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java Fri Apr 18 17:25:43 2014 -0700 @@ -60,7 +60,7 @@ */ public static void main(String[] args) { TestSimpleTagInherit tester = new TestSimpleTagInherit(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -65,8 +65,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(); }
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java Fri Apr 18 17:25:43 2014 -0700 @@ -55,7 +55,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(); }
--- a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java Fri Apr 18 17:25:43 2014 -0700 @@ -77,8 +77,8 @@ */ 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.run(ARGS1, TEST, NEGATED_TEST); + tester.run(ARGS2, TEST, NEGATED_TEST); tester.runDiffs(FILES_TO_DIFF); }
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java Fri Apr 18 17:25:43 2014 -0700 @@ -154,7 +154,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(); }
--- a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java Fri Apr 18 17:25:43 2014 -0700 @@ -64,7 +64,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(); }
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java Fri Apr 18 17:25:43 2014 -0700 @@ -56,7 +56,7 @@ */ public static void main(String[] args) { TestSummaryHeading tester = new TestSummaryHeading(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java Fri Apr 18 17:25:43 2014 -0700 @@ -53,7 +53,7 @@ */ public static void main(String[] args) { TestSuperClassInSerialForm tester = new TestSuperClassInSerialForm(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java Fri Apr 18 17:25:43 2014 -0700 @@ -61,7 +61,7 @@ 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);
--- a/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java Fri Apr 18 17:25:43 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 @@ -74,7 +74,8 @@ * @param args the array of command line arguments. */ public static void main(String[] args) { - run(new TestTagHolderMethod(), ARGS, new String[][]{}, new String[][]{}); + JavadocTester tester = new TestTagHolderMethod(); + tester.run(ARGS, new String[][]{}, new String[][]{}); } /**
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java Fri Apr 18 17:25:43 2014 -0700 @@ -69,7 +69,7 @@ tests[tests.length - 1][1] = "<div class=\"block\">First sentence.</div>"; TestTagInheritence tester = new TestTagInheritence(); - run(tester, ARGS, tests, NO_TEST); + tester.run(ARGS, tests, NO_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java Fri Apr 18 17:25:43 2014 -0700 @@ -50,7 +50,7 @@ */ public static void main(String[] args) { TestTagMisuse tester = new TestTagMisuse(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java Fri Apr 18 17:25:43 2014 -0700 @@ -58,7 +58,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(); }
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java Fri Apr 18 17:25:43 2014 -0700 @@ -74,10 +74,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, NEGATED_TEST_4654308); tester.printSummary(); tester = new TestTaglets(); - run(tester, ARGS_4767038, TEST_4767038, NEGATED_TEST_4767038); + tester.run(ARGS_4767038, TEST_4767038, NEGATED_TEST_4767038); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java Fri Apr 18 17:25:43 2014 -0700 @@ -51,7 +51,7 @@ */ public static void main(String[] args) { TestThrowsHead tester = new TestThrowsHead(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java Fri Apr 18 17:25:43 2014 -0700 @@ -58,7 +58,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(); }
--- a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -64,7 +64,7 @@ */ public static void main(String[] args) { TestThrowsTag tester = new TestThrowsTag(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java Fri Apr 18 17:25:43 2014 -0700 @@ -64,7 +64,7 @@ */ public static void main(String[] args) { TestTitleInHref tester = new TestTitleInHref(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java Fri Apr 18 17:25:43 2014 -0700 @@ -78,7 +78,7 @@ */ public static void main(String[] args) { TestTopOption tester = new TestTopOption(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java Fri Apr 18 17:25:43 2014 -0700 @@ -383,7 +383,7 @@ */ public static void main(String[] args) { TestTypeAnnotations tester = new TestTypeAnnotations(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java Fri Apr 18 17:25:43 2014 -0700 @@ -92,8 +92,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, NEGATED_TEST); + tester.run(ARGS2, TEST2, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java Fri Apr 18 17:25:43 2014 -0700 @@ -72,7 +72,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(); }
--- a/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java Fri Apr 18 17:25:43 2014 -0700 @@ -105,9 +105,9 @@ 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); + tester.run(ARGS2, NO_TEST, NO_TEST); String usePageContents = tester.readFileToString(BUG_ID + "-2/pkg1/class-use/UsedClass.html"); int prevIndex = -1; @@ -120,8 +120,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(); }
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java Fri Apr 18 17:25:43 2014 -0700 @@ -155,9 +155,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(); }
--- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java Fri Apr 18 17:25:43 2014 -0700 @@ -52,7 +52,7 @@ */ public static void main(String[] args) { TestWarnBadParamNames tester = new TestWarnBadParamNames(); - run(tester, ARGS, TEST, NEGATED_TEST); + tester.run(ARGS, TEST, NEGATED_TEST); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java Fri Apr 18 17:25:43 2014 -0700 @@ -83,8 +83,8 @@ */ 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(ARGS2, TEST2, NEGATED_TEST2); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java Fri Apr 18 17:25:43 2014 -0700 @@ -193,14 +193,14 @@ */ public static void main(String[] args) { TestWindowTitle tester = new TestWindowTitle(); - run(tester, ARGS_JS_CHARS, TEST_JS_CHARS, NEG_TEST_JS_CHARS); - run(tester, ARGS_SCRIPT_TAG, TEST_SCRIPT_TAG, NEG_TEST_SCRIPT_TAG); - run(tester, ARGS_HTML_TAGS, TEST_HTML_TAGS, NEG_TEST_HTML_TAGS); - run(tester, ARGS_HTML_ENTITIES, TEST_HTML_ENTITIES, NEG_TEST_HTML_ENTITIES); - run(tester, ARGS_EMPTY_TAGS, TEST_EMPTY_TAGS, NEG_TEST_EMPTY_TAGS); - run(tester, ARGS_UNICODE_CHARS, TEST_UNICODE_CHARS, NEG_TEST_UNICODE_CHARS); - run(tester, ARGS_EMPTY_TITLE, TEST_EMPTY, NO_TEST); - run(tester, ARGS_DOCTITLE, NO_TEST, NEG_TEST_DOCTITLE); + 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(); }
--- a/langtools/test/com/sun/javadoc/testXOption/TestXOption.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testXOption/TestXOption.java Fri Apr 18 17:25:43 2014 -0700 @@ -64,7 +64,7 @@ */ public static void main(String[] args) { TestXOption tester = new TestXOption(); - int actualExitCode = run(tester, ARGS, TEST, NEGATED_TEST); + int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST); tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode); tester.printSummary(); }
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java Fri Apr 18 17:23:36 2014 -0700 +++ b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java Fri Apr 18 17:25:43 2014 -0700 @@ -114,7 +114,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(); }