archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8041150: Avoid silly use of static methods in JavadocTester

Browse source 
Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2014-04-18 17:25:43 -07:00
parent a2d155dfa9
commit 04e1109b69
131 changed files with 205 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
View file

@ -67,7 +67,7 @@ public class AccessSummary extends JavadocTester {
*/
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
}

4
langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
View file

@ -132,8 +132,8 @@ public class MetaTag extends JavadocTester {
*/
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();
}

6
langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
View file

@ -107,9 +107,9 @@ public class PackagesHeader extends JavadocTester {
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();
}

4
langtools/test/com/sun/javadoc/_template/Template.java
View file

@ -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 class Template extends JavadocTester {
*/
public static void main(String[] args) {
Template tester = new Template();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/_template/TemplateComplete.java
View file

@ -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 class TemplateComplete extends JavadocTester {
*/
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();

2
langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
View file

@ -53,7 +53,7 @@ public class TestConstantValuesDriver extends JavadocTester {
tests[tests.length-1][0] = BUG_ID + "/constant-values.html";
tests[tests.length-1][1] = "<code>\"&lt;Hello World&gt;\"</code>";
TestConstantValuesDriver tester = new TestConstantValuesDriver();
run(tester, ARGS, tests, NO_TEST);
tester.run(ARGS, tests, NO_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
View file

@ -49,7 +49,7 @@ public class TestDupThrowsTags extends JavadocTester {
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();
}

20
langtools/test/com/sun/javadoc/lib/JavadocTester.java
View file

@ -145,23 +145,21 @@ public abstract class JavadocTester {
/**
* 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 @@ public abstract class JavadocTester {
* @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;
}

4
langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
View file

@ -53,8 +53,8 @@ public class TestAbsLinkPath extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
View file

@ -101,7 +101,7 @@ public class TestAbstractMethod extends JavadocTester {
*/
public static void main(String[] args) {
TestAbstractMethod tester = new TestAbstractMethod();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
View file

@ -270,7 +270,7 @@ public class TestAnchorNames extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
View file

@ -58,7 +58,7 @@ public class TestAnnotationOptional extends JavadocTester {
*/
public static void main(String[] args) {
TestAnnotationOptional tester = new TestAnnotationOptional();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
View file

@ -87,7 +87,7 @@ public class TestAnnotationTypes extends JavadocTester {
*/
public static void main(String[] args) {
TestAnnotationTypes tester = new TestAnnotationTypes();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
View file

@ -50,7 +50,7 @@ public class TestBackSlashInLink extends JavadocTester {
*/
public static void main(String[] args) {
TestBackSlashInLink tester = new TestBackSlashInLink();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
View file

@ -57,7 +57,7 @@ public class TestBadPackageFileInJar extends JavadocTester {
*/
public static void main(String[] args) {
TestBadPackageFileInJar tester = new TestBadPackageFileInJar();
run(tester, ARGS, TEST, NO_TEST);
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
View file

@ -53,7 +53,7 @@ public class TestBadSourceFile extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
View file

@ -50,7 +50,7 @@ public class TestBaseClass extends JavadocTester {
*/
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.");
}
}

2
langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
View file

@ -53,7 +53,7 @@ public class TestBreakIterator extends JavadocTester {
*/
public static void main(String[] args) {
TestBreakIterator tester = new TestBreakIterator();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
View file

@ -60,7 +60,7 @@ public class TestCRLineSeparator extends JavadocTester {
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();
}

2
langtools/test/com/sun/javadoc/testCharset/TestCharset.java
View file

@ -62,7 +62,7 @@ public class TestCharset extends JavadocTester {
*/
public static void main(String[] args) {
TestCharset tester = new TestCharset();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
View file

@ -66,7 +66,7 @@ public class TestClassCrossReferences extends JavadocTester {
*/
public static void main(String[] args) {
TestClassCrossReferences tester = new TestClassCrossReferences();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
View file

@ -89,7 +89,7 @@ public class TestClassTree extends JavadocTester {
*/
public static void main(String[] args) {
TestClassTree tester = new TestClassTree();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
View file

@ -70,8 +70,8 @@ public class TestCmndLineClass extends JavadocTester {
*/
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);
}

4
langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
View file

@ -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 class TestCompletionFailure extends JavadocTester {
*/
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();
}

4
langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java
View file

@ -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 class TestConstantValuesPage extends JavadocTester {
*/
public static void main(String[] args) {
TestConstantValuesPage tester = new TestConstantValuesPage();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
View file

@ -61,7 +61,7 @@ public class TestConstructorIndent extends JavadocTester {
*/
public static void main(String[] args) {
TestConstructorIndent tester = new TestConstructorIndent();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
View file

@ -127,7 +127,7 @@ public class TestConstructors extends JavadocTester {
*/
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();
}

8
langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
View file

@ -88,10 +88,10 @@ public class TestCustomTag extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
View file

@ -100,7 +100,7 @@ public class TestDeprecatedDocs extends JavadocTester {
*/
public static void main(String[] args) {
TestDeprecatedDocs tester = new TestDeprecatedDocs();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
View file

@ -64,7 +64,7 @@ public class TestDocEncoding extends JavadocTester {
*/
public static void main(String[] args) {
TestDocEncoding tester = new TestDocEncoding();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
View file

@ -57,7 +57,7 @@ public class TestDocErrorReporter extends JavadocTester {
*/
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();
}

6
langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
View file

@ -95,10 +95,10 @@ public class TestDocFileDir extends JavadocTester {
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();
}

2
langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
View file

@ -47,7 +47,7 @@ public class TestDocFiles extends JavadocTester {
*/
public static void main(String[] args) {
TestDocFiles tester = new TestDocFiles();
run(tester, ARGS, TEST, NO_TEST);
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
View file

@ -65,7 +65,7 @@ public class TestDocRootInlineTag extends JavadocTester {
*/
public static void main(String[] args) {
TestDocRootInlineTag tester = new TestDocRootInlineTag();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
View file

@ -128,8 +128,8 @@ public class TestDocRootLink extends JavadocTester {
*/
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();
}

4
langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
View file

@ -48,7 +48,9 @@ public class TestDupParamWarn extends JavadocTester {
* @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();
}
/**

2
langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
View file

@ -60,7 +60,7 @@ public class TestEmptyClass extends JavadocTester {
*/
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");

2
langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
View file

@ -54,7 +54,7 @@ public class TestEnclosingClass extends JavadocTester {
*/
public static void main(String[] args) {
TestEnclosingClass tester = new TestEnclosingClass();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
View file

@ -54,7 +54,7 @@ public class TestEncoding extends JavadocTester {
*/
public static void main(String[] args) {
TestEncoding tester = new TestEncoding();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
View file

@ -67,7 +67,7 @@ public class TestExternalOverridenMethod extends JavadocTester {
*/
public static void main(String[] args) {
TestExternalOverridenMethod tester = new TestExternalOverridenMethod();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
View file

@ -100,8 +100,8 @@ public class TestGeneratedBy extends JavadocTester {
*/
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");

6
langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
View file

@ -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 class TestGroupOption extends JavadocTester {
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();
}

2
langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
View file

@ -119,7 +119,7 @@ public class TestHeadings extends JavadocTester {
*/
public static void main(String[] args) {
TestHeadings tester = new TestHeadings();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
View file

@ -56,7 +56,7 @@ public class TestHelpFile extends JavadocTester {
*/
public static void main(String[] args) {
TestHelpFile tester = new TestHelpFile();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
View file

@ -104,9 +104,9 @@ public class TestHelpOption extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
View file

@ -56,7 +56,7 @@ public class TestHiddenMembers extends JavadocTester {
*/
public static void main(String[] args) {
TestHiddenMembers tester = new TestHiddenMembers();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testHref/TestHref.java
View file

@ -95,7 +95,7 @@ public class TestHref extends JavadocTester {
*/
public static void main(String[] args) {
TestHref tester = new TestHref();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
View file

@ -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 class TestHrefInDocComment extends JavadocTester {
*/
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.");
}

2
langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
View file

@ -56,7 +56,7 @@ public class TestHtmlComments extends JavadocTester {
*/
public static void main(String[] args) {
TestHtmlComments tester = new TestHtmlComments();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

16
langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
View file

@ -355,14 +355,14 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
*/
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();
}

4
langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
View file

@ -65,8 +65,8 @@ public class TestHtmlStrongTag extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
View file

@ -90,7 +90,7 @@ public class TestHtmlTableStyles extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
View file

@ -433,7 +433,7 @@ public class TestHtmlTableTags extends JavadocTester {
*/
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();
}

6
langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
View file

@ -73,9 +73,9 @@ public class TestHtmlTag extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
View file

@ -59,7 +59,7 @@ public class TestIndentation extends JavadocTester {
*/
public static void main(String[] args) {
TestIndentation tester = new TestIndentation();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testIndex/TestIndex.java
View file

@ -89,7 +89,7 @@ public class TestIndex extends JavadocTester {
*/
public static void main(String[] args) {
TestIndex tester = new TestIndex();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
View file

@ -55,7 +55,7 @@ public class TestInlineLinkLabel extends JavadocTester {
*/
public static void main(String[] args) {
TestInlineLinkLabel tester = new TestInlineLinkLabel();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testInterface/TestInterface.java
View file

@ -126,7 +126,7 @@ public class TestInterface extends JavadocTester {
*/
public static void main(String[] args) {
TestInterface tester = new TestInterface();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
View file

@ -94,7 +94,7 @@ public class TestJavaFX extends JavadocTester {
*/
public static void main(String[] args) {
TestJavaFX tester = new TestJavaFX();
run(tester, ARGS, TEST, NO_TEST);
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
View file

@ -122,7 +122,7 @@ public class TestJavascript extends JavadocTester {
*/
public static void main(String[] args) {
TestJavascript tester = new TestJavascript();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
View file

@ -114,8 +114,8 @@ public class TestLambdaFeature extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
View file

@ -60,7 +60,7 @@ public class LeadingSpaces extends JavadocTester {
*/
public static void main(String[] args) {
LeadingSpaces tester = new LeadingSpaces();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
View file

@ -59,7 +59,7 @@ public class TestLegacyTaglet extends JavadocTester {
*/
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");
}

4
langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java
View file

@ -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 class TestBadLinkOption extends JavadocTester {
*/
public static void main(String[] args) {
TestBadLinkOption tester = new TestBadLinkOption();
run(tester, ARGS, TEST, NEG_TEST);
tester.run(ARGS, TEST, NEG_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
View file

@ -121,8 +121,8 @@ public class TestLinkOption extends JavadocTester {
*/
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();

4
langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java
View file

@ -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 class TestNewLineInLink extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
View file

@ -76,7 +76,7 @@ public class TestLinkTaglet extends JavadocTester {
*/
public static void main(String[] args) {
TestLinkTaglet tester = new TestLinkTaglet();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
View file

@ -51,7 +51,7 @@ public class TestLinkToSerialForm extends JavadocTester {
*/
public static void main(String[] args) {
TestLinkToSerialForm tester = new TestLinkToSerialForm();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
View file

@ -97,7 +97,7 @@ public class TestLiteralCodeInPre extends JavadocTester {
*/
public static void main(String[] args) {
TestLiteralCodeInPre tester = new TestLiteralCodeInPre();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
View file

@ -105,7 +105,7 @@ public class TestMemberInheritence extends JavadocTester {
*/
public static void main(String[] args) {
TestMemberInheritence tester = new TestMemberInheritence();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
View file

@ -75,7 +75,7 @@ public class TestMemberSummary extends JavadocTester {
*/
public static void main(String[] args) {
TestMemberSummary tester = new TestMemberSummary();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
View file

@ -119,7 +119,7 @@ public class TestMethodTypes extends JavadocTester {
*/
public static void main(String[] args) {
TestMethodTypes tester = new TestMethodTypes();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testModifier/TestModifier.java
View file

@ -50,7 +50,7 @@ public class TestModifier extends JavadocTester {
*/
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.");
}
}

2
langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
View file

@ -73,7 +73,7 @@ public class TestNavigation extends JavadocTester {
*/
public static void main(String[] args) {
TestNavigation tester = new TestNavigation();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
View file

@ -58,7 +58,7 @@ public class TestNestedGenerics extends JavadocTester {
*/
public static void main(String[] args) {
TestNestedGenerics tester = new TestNestedGenerics();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
View file

@ -93,7 +93,7 @@ public class TestNestedInlineTag extends JavadocTester {
*/
public static void main(String[] args) {
TestNestedInlineTag tester = new TestNestedInlineTag();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
View file

@ -763,7 +763,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
*/
public static void main(String[] args) {
TestNewLanguageFeatures tester = new TestNewLanguageFeatures();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
View file

@ -50,7 +50,7 @@ public class TestNoPackagesFile extends JavadocTester {
*/
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 {

2
langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java
View file

@ -51,7 +51,7 @@ public class TestNonFrameWarning extends JavadocTester {
*/
public static void main(String[] args) {
TestNonFrameWarning tester = new TestNonFrameWarning();
run(tester, ARGS, TEST, NO_TEST);
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}

8
langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
View file

@ -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 class TestNotifications extends JavadocTester {
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();
}

2
langtools/test/com/sun/javadoc/testOptions/TestOptions.java
View file

@ -57,7 +57,7 @@ public class TestOptions extends JavadocTester {
*/
public static void main(String[] args) {
TestOptions tester = new TestOptions();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
View file

@ -82,7 +82,7 @@ public class TestMultiInheritence extends JavadocTester {
*/
public static void main(String[] args) {
TestMultiInheritence tester = new TestMultiInheritence();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
View file

@ -59,7 +59,7 @@ public class TestOverridenMethodDocCopy extends JavadocTester {
*/
public static void main(String[] args) {
TestOverridenMethodDocCopy tester = new TestOverridenMethodDocCopy();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
View file

@ -83,7 +83,7 @@ public class TestOverridenPrivateMethods extends JavadocTester {
*/
public static void main(String[] args) {
TestOverridenPrivateMethods tester = new TestOverridenPrivateMethods();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
View file

@ -90,7 +90,7 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
*/
public static void main(String[] args) {
TestOverridenPrivateMethodsWithPackageFlag tester = new TestOverridenPrivateMethodsWithPackageFlag();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
View file

@ -86,7 +86,7 @@ public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
*/
public static void main(String[] args) {
TestOverridenPrivateMethodsWithPrivateFlag tester = new TestOverridenPrivateMethodsWithPrivateFlag();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
View file

@ -70,8 +70,8 @@ public class TestPackageDeprecation extends JavadocTester {
*/
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" +

4
langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
View file

@ -90,8 +90,8 @@ public class TestPackagePage extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
View file

@ -75,7 +75,7 @@ public class TestParamTaglet extends JavadocTester {
*/
public static void main(String[] args) {
TestParamTaglet tester = new TestParamTaglet();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
View file

@ -269,8 +269,8 @@ public class TestPrivateClasses extends JavadocTester {
*/
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();
}

4
langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java
View file

@ -282,8 +282,8 @@ public class TestProfiles extends JavadocTester {
*/
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();
}

4
langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
View file

@ -114,9 +114,9 @@ public class TestProfilesConfiguration extends JavadocTester {
*/
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();
}

2
langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
View file

@ -55,7 +55,7 @@ public class TestRecurseSubPackages extends JavadocTester {
{BUG_ID + "/allclasses-frame.html", "DummyClass.html"}
};
TestRecurseSubPackages tester = new TestRecurseSubPackages();
run(tester, ARGS, tests, negatedTests);
tester.run(ARGS, tests, negatedTests);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
View file

@ -107,7 +107,7 @@ public class TestRelativeLinks extends JavadocTester {
*/
public static void main(String[] args) {
TestRelativeLinks tester = new TestRelativeLinks();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
View file

@ -167,7 +167,7 @@ public class TestRepeatedAnnotations extends JavadocTester {
*/
public static void main(String[] args) {
TestRepeatedAnnotations tester = new TestRepeatedAnnotations();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
View file

@ -63,7 +63,7 @@ public class TestReturnTag extends JavadocTester {
*/
public static void main(String[] args) {
TestReturnTag tester = new TestReturnTag();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
View file

@ -60,7 +60,7 @@ public class TestSeeTag extends JavadocTester {
*/
public static void main(String[] args) {
TestSeeTag tester = new TestSeeTag();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

2
langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
View file

@ -57,7 +57,7 @@ public class TestSerialVersionUID extends JavadocTester {
*/
public static void main(String[] args) {
TestSerialVersionUID tester = new TestSerialVersionUID();
run(tester, ARGS, TEST, NEGATED_TEST);
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}

4
langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
View file

@ -132,8 +132,8 @@ public class TestSerializedForm extends JavadocTester implements Serializable {
*/
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();
}

8
langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
View file

@ -138,10 +138,10 @@ public class TestSerializedFormDeprecationInfo extends JavadocTester {
*/
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();
}

Some files were not shown because too many files have changed in this diff Show more