archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +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

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;
}