author | ssides |
Wed, 09 Jul 2014 15:14:06 +0400 | |
changeset 25760 | 7955db32d6b0 |
parent 25004 | b33effe4f252 |
child 26091 | c40ba05822ad |
permissions | -rw-r--r-- |
10 | 1 |
/* |
23971 | 2 |
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. |
10 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5520 | 19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
10 | 22 |
*/ |
23 |
||
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
24 |
import java.io.BufferedWriter; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
25 |
import java.io.ByteArrayOutputStream; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
26 |
import java.io.File; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
27 |
import java.io.FileNotFoundException; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
28 |
import java.io.FileWriter; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
29 |
import java.io.FilenameFilter; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
30 |
import java.io.IOException; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
31 |
import java.io.PrintStream; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
32 |
import java.io.PrintWriter; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
33 |
import java.io.StringWriter; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
34 |
import java.lang.annotation.Annotation; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
35 |
import java.lang.annotation.Retention; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
36 |
import java.lang.annotation.RetentionPolicy; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
37 |
import java.lang.ref.SoftReference; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
38 |
import java.lang.reflect.InvocationTargetException; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
39 |
import java.lang.reflect.Method; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
40 |
import java.nio.file.Files; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
41 |
import java.util.ArrayList; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
42 |
import java.util.EnumMap; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
43 |
import java.util.HashMap; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
44 |
import java.util.List; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
45 |
import java.util.Map; |
10 | 46 |
|
47 |
||
48 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
49 |
* Test framework for running javadoc and performing tests on the resulting output. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
50 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
51 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
52 |
* Tests are typically written as subtypes of JavadocTester, with a main |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
53 |
* method that creates an instance of the test class and calls the runTests() |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
54 |
* method. The runTests() methods calls all the test methods declared in the class, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
55 |
* and then calls a method to print a summary, and throw an exception if |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
56 |
* any of the test methods reported a failure. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
57 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
58 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
59 |
* Test methods are identified with a @Test annotation. They have no parameters. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
60 |
* The name of the method is not important, but if you have more than one, it is |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
61 |
* recommended that the names be meaningful and suggestive of the test case |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
62 |
* contained therein. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
63 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
64 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
65 |
* Typically, a test method will invoke javadoc, and then perform various |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
66 |
* checks on the results. The standard checks are: |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
67 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
68 |
* <dl> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
69 |
* <dt>checkExitCode |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
70 |
* <dd>Check the exit code returned from javadoc. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
71 |
* <dt>checkOutput |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
72 |
* <dd>Perform a series of checks on the contents on a file or output stream |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
73 |
* generated by javadoc. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
74 |
* The checks can be either that a series of strings are found or are not found. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
75 |
* <dt>checkFiles |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
76 |
* <dd>Perform a series of checks on the files generated by javadoc. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
77 |
* The checks can be that a series of files are found or are not found. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
78 |
* </dl> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
79 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
80 |
* <pre><code> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
81 |
* public class MyTester extends JavadocTester { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
82 |
* public static void main(String... args) throws Exception { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
83 |
* MyTester tester = new MyTester(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
84 |
* tester.runTests(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
85 |
* } |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
86 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
87 |
* // test methods... |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
88 |
* @Test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
89 |
* void test() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
90 |
* javadoc(<i>args</i>); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
91 |
* checkExit(Exit.OK); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
92 |
* checkOutput(<i>file</i>, true, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
93 |
* <i>strings-to-find</i>); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
94 |
* checkOutput(<i>file</i>, false, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
95 |
* <i>strings-to-not-find</i>); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
96 |
* } |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
97 |
* } |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
98 |
* </code></pre> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
99 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
100 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
101 |
* If javadoc is run more than once in a test method, you can compare the |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
102 |
* results that are generated with the diff method. Since files written by |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
103 |
* javadoc typically contain a timestamp, you may want to use the -notimestamp |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
104 |
* option if you are going to compare the results from two runs of javadoc. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
105 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
106 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
107 |
* If you have many calls of checkOutput that are very similar, you can write |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
108 |
* your own check... method to reduce the amount of duplication. For example, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
109 |
* if you want to check that many files contain the same string, you could |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
110 |
* write a method that takes a varargs list of files and calls checkOutput |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
111 |
* on each file in turn with the string to be checked. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
112 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
113 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
114 |
* You can also write you own custom check methods, which can use |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
115 |
* readFile to get the contents of a file generated by javadoc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
116 |
* and then use pass(...) or fail(...) to report whether the check |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
117 |
* succeeded or not. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
118 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
119 |
* <p> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
120 |
* You can have many separate test methods, each identified with a @Test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
121 |
* annotation. However, you should <b>not</b> assume they will be called |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
122 |
* in the order declared in your source file. If the order of a series |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
123 |
* of javadoc invocations is important, do that within a single method. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
124 |
* If the invocations are independent, for better clarity, use separate |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
125 |
* test methods, each with their own set of checks on the results. |
10 | 126 |
* |
127 |
* @author Doug Kramer |
|
128 |
* @author Jamie Ho |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
129 |
* @author Jonathan Gibbons (rewrite) |
10 | 130 |
*/ |
131 |
public abstract class JavadocTester { |
|
132 |
||
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
133 |
public static final String FS = System.getProperty("file.separator"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
134 |
public static final String PS = System.getProperty("path.separator"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
135 |
public static final String NL = System.getProperty("line.separator"); |
23971 | 136 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
137 |
public enum Output { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
138 |
/** The name for error output from javadoc. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
139 |
ERROR, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
140 |
/** The name for the notice output from javadoc. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
141 |
NOTICE, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
142 |
/** The name for the warning output from javadoc. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
143 |
WARNING, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
144 |
/** The name for any output written to System.out. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
145 |
STDOUT, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
146 |
/** The name for any output written to System.err. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
147 |
STDERR |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
148 |
} |
10 | 149 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
150 |
/** The output directory used in the most recent call of javadoc. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
151 |
protected File outputDir; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
152 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
153 |
/** The exit code of the most recent call of javadoc. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
154 |
private int exitCode; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
155 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
156 |
/** The output generated by javadoc to the various writers and streams. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
157 |
private final Map<Output, String> outputMap = new EnumMap<>(Output.class); |
10 | 158 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
159 |
/** A cache of file content, to avoid reading files unnecessarily. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
160 |
private final Map<File,SoftReference<String>> fileContentCache = new HashMap<>(); |
10 | 161 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
162 |
/** Stream used for logging messages. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
163 |
private final PrintStream out = System.out; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
164 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
165 |
/** The directory containing the source code for the test. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
166 |
public static final String testSrc = System.getProperty("test.src"); |
10 | 167 |
|
168 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
169 |
* Get the path for a source file in the test source directory. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
170 |
* @param path the path of a file or directory in the source directory |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
171 |
* @return the full path of the specified file |
10 | 172 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
173 |
public static String testSrc(String path) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
174 |
return new File(testSrc, path).getPath(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
175 |
} |
24072 | 176 |
|
177 |
/** |
|
24217
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
178 |
* Alternatives for checking the contents of a directory. |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
179 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
180 |
public enum DirectoryCheck { |
24217
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
181 |
/** |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
182 |
* Check that the directory is empty. |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
183 |
*/ |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
184 |
EMPTY((file, name) -> true), |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
185 |
/** |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
186 |
* Check that the directory does not contain any HTML files, |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
187 |
* such as may have been generated by a prior run of javadoc |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
188 |
* using this directory. |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
189 |
* For now, the check is only performed on the top level directory. |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
190 |
*/ |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
191 |
NO_HTML_FILES((file, name) -> name.endsWith(".html")), |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
192 |
/** |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
193 |
* No check is performed on the directory contents. |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
194 |
*/ |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
195 |
NONE(null) { @Override void check(File dir) { } }; |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
196 |
|
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
197 |
/** The filter used to detect that files should <i>not</i> be present. */ |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
198 |
FilenameFilter filter; |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
199 |
|
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
200 |
DirectoryCheck(FilenameFilter f) { |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
201 |
filter = f; |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
202 |
} |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
203 |
|
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
204 |
void check(File dir) { |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
205 |
if (dir.isDirectory()) { |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
206 |
String[] contents = dir.list(filter); |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
207 |
if (contents == null) |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
208 |
throw new Error("cannot list directory: " + dir); |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
209 |
if (contents.length > 0) |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
210 |
throw new Error("directory has unexpected content: " + dir); |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
211 |
} |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
212 |
} |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
213 |
} |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
214 |
|
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
215 |
private DirectoryCheck outputDirectoryCheck = DirectoryCheck.EMPTY; |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
216 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
217 |
/** The current subtest number. Incremented when checking(...) is called. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
218 |
private int numTestsRun = 0; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
219 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
220 |
/** The number of subtests passed. Incremented when passed(...) is called. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
221 |
private int numTestsPassed = 0; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
222 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
223 |
/** The current run of javadoc. Incremented when javadoc is called. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
224 |
private int javadocRunNum = 0; |
10 | 225 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
226 |
/** The name of the standard doclet. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
227 |
// This ought not to be necessary; there ought to be a javadoc entry point |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
228 |
// that does not require this to be know externally. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
229 |
private static final String standardDocletClassName = |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
230 |
"com.sun.tools.doclets.standard.Standard"; |
10 | 231 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
232 |
/** Marker annotation for test methods to be invoked by runTests. */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
233 |
@Retention(RetentionPolicy.RUNTIME) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
234 |
@interface Test { } |
10 | 235 |
|
236 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
237 |
* Run all methods annotated with @Test, followed by printSummary. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
238 |
* Typically called on a tester object in main() |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
239 |
* @throws Exception if any errors occurred |
10 | 240 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
241 |
public void runTests() throws Exception { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
242 |
for (Method m: getClass().getDeclaredMethods()) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
243 |
Annotation a = m.getAnnotation(Test.class); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
244 |
if (a != null) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
245 |
try { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
246 |
out.println("Running test " + m.getName()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
247 |
m.invoke(this, new Object[] { }); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
248 |
} catch (InvocationTargetException e) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
249 |
Throwable cause = e.getCause(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
250 |
throw (cause instanceof Exception) ? ((Exception) cause) : e; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
251 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
252 |
out.println(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
253 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
254 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
255 |
printSummary(); |
10 | 256 |
} |
257 |
||
258 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
259 |
* Run javadoc. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
260 |
* The output directory used by this call and the final exit code |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
261 |
* will be saved for later use. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
262 |
* To aid the reader, it is recommended that calls to this method |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
263 |
* put each option and the arguments it takes on a separate line. |
20238
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
264 |
* |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
265 |
* Example: |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
266 |
* <pre><code> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
267 |
* javadoc("-d", "out", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
268 |
* "-sourcepath", testSrc, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
269 |
* "-notimestamp", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
270 |
* "pkg1", "pkg2", "pkg3/C.java"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
271 |
* </code></pre> |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
272 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
273 |
* @param args the arguments to pass to javadoc |
20238
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
274 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
275 |
public void javadoc(String... args) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
276 |
outputMap.clear(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
277 |
fileContentCache.clear(); |
20238
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
278 |
|
10 | 279 |
javadocRunNum++; |
280 |
if (javadocRunNum == 1) { |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
281 |
out.println("Running javadoc..."); |
10 | 282 |
} else { |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
283 |
out.println("Running javadoc (run " |
10 | 284 |
+ javadocRunNum + ")..."); |
285 |
} |
|
24072 | 286 |
outputDir = new File("."); |
287 |
for (int i = 0; i < args.length - 2; i++) { |
|
288 |
if (args[i].equals("-d")) { |
|
289 |
outputDir = new File(args[++i]); |
|
290 |
break; |
|
291 |
} |
|
292 |
} |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
293 |
// log.setOutDir(outputDir); |
10 | 294 |
|
24217
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
295 |
outputDirectoryCheck.check(outputDir); |
25b12d4d4192
8040904: Ensure javadoc tests do not overwrite results within tests
jjg
parents:
24072
diff
changeset
|
296 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
297 |
// These are the primary streams used by javadoc |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
298 |
WriterOutput errOut = new WriterOutput(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
299 |
WriterOutput warnOut = new WriterOutput(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
300 |
WriterOutput noticeOut = new WriterOutput(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
301 |
// These are to catch output to System.out and System.err, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
302 |
// in case these are used instead of the primary streams |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
303 |
StreamOutput sysOut = new StreamOutput(System.out, System::setOut); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
304 |
StreamOutput sysErr = new StreamOutput(System.err, System::setErr); |
10190
11c701650189
6735320: StringIndexOutOfBoundsException for empty @serialField tag
ksrini
parents:
5520
diff
changeset
|
305 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
306 |
try { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
307 |
exitCode = com.sun.tools.javadoc.Main.execute( |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
308 |
"javadoc", |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
309 |
errOut.pw, warnOut.pw, noticeOut.pw, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
310 |
standardDocletClassName, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
311 |
args); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
312 |
} finally { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
313 |
outputMap.put(Output.STDOUT, sysOut.close()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
314 |
outputMap.put(Output.STDERR, sysErr.close()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
315 |
outputMap.put(Output.ERROR, errOut.close()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
316 |
outputMap.put(Output.WARNING, warnOut.close()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
317 |
outputMap.put(Output.NOTICE, noticeOut.close()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
318 |
} |
10 | 319 |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
320 |
outputMap.forEach((name, text) -> { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
321 |
if (!text.isEmpty()) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
322 |
out.println("javadoc " + name + ":"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
323 |
out.println(text); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
324 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
325 |
}); |
10 | 326 |
} |
327 |
||
328 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
329 |
* Set the kind of check for the initial contents of the output directory |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
330 |
* before javadoc is run. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
331 |
* The filter should return true for files that should <b>not</b> appear. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
332 |
* @param c the kind of check to perform |
10 | 333 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
334 |
public void setOutputDirectoryCheck(DirectoryCheck c) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
335 |
outputDirectoryCheck = c; |
10 | 336 |
} |
337 |
||
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
338 |
public enum Exit { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
339 |
OK(0), |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
340 |
FAILED(1); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
341 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
342 |
Exit(int code) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
343 |
this.code = code; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
344 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
345 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
346 |
final int code; |
20238
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
347 |
} |
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
348 |
|
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
349 |
/** |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
350 |
* Check the exit code of the most recent call of javadoc. |
10 | 351 |
* |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
352 |
* @param expected the exit code that is required for the test |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
353 |
* to pass. |
10 | 354 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
355 |
public void checkExit(Exit expected) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
356 |
checking("check exit code"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
357 |
if (exitCode == expected.code) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
358 |
passed("return code " + exitCode); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
359 |
} else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
360 |
failed("return code " + exitCode +"; expected " + expected.code + " (" + expected + ")"); |
10 | 361 |
} |
362 |
} |
|
363 |
||
364 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
365 |
* Check for content in (or not in) the generated output. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
366 |
* Within the search strings, the newline character \n |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
367 |
* will be translated to the platform newline character sequence. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
368 |
* @param path a path within the most recent output directory |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
369 |
* or the name of one of the output buffers, identifying |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
370 |
* where to look for the search strings. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
371 |
* @param expectedFound true if all of the search strings are expected |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
372 |
* to be found, or false if all of the strings are expected to be |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
373 |
* not found |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
374 |
* @param strings the strings to be searched for |
20238
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
375 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
376 |
public void checkOutput(String path, boolean expectedFound, String... strings) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
377 |
// Read contents of file |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
378 |
String fileString; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
379 |
try { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
380 |
fileString = readFile(outputDir, path); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
381 |
} catch (Error e) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
382 |
if (!expectedFound) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
383 |
failed("Error reading file: " + e); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
384 |
return; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
385 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
386 |
throw e; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
387 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
388 |
checkOutput(path, fileString, expectedFound, strings); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
389 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
390 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
391 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
392 |
* Check for content in (or not in) the one of the output streams written by |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
393 |
* javadoc. Within the search strings, the newline character \n |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
394 |
* will be translated to the platform newline character sequence. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
395 |
* @param output the output stream to check |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
396 |
* @param expectedFound true if all of the search strings are expected |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
397 |
* to be found, or false if all of the strings are expected to be |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
398 |
* not found |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
399 |
* @param strings the strings to be searched for |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
400 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
401 |
public void checkOutput(Output output, boolean expectedFound, String... strings) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
402 |
checkOutput(output.toString(), outputMap.get(output), expectedFound, strings); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
403 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
404 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
405 |
private void checkOutput(String path, String fileString, boolean expectedFound, String... strings) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
406 |
for (String stringToFind : strings) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
407 |
// log.logCheckOutput(path, expectedFound, stringToFind); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
408 |
checking("checkOutput"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
409 |
// Find string in file's contents |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
410 |
boolean isFound = findString(fileString, stringToFind); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
411 |
if (isFound == expectedFound) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
412 |
passed(path + ": " + (isFound ? "found:" : "not found:") + "\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
413 |
+ stringToFind + "\n"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
414 |
} else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
415 |
failed(path + ": " + (isFound ? "found:" : "not found:") + "\n" |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
416 |
+ stringToFind + "\n"); |
20238
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
417 |
} |
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
418 |
} |
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
419 |
} |
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
420 |
|
a08610368936
8024096: some javadoc tests may contain false positive results
bpatel
parents:
10190
diff
changeset
|
421 |
/** |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
422 |
* Check for files in (or not in) the generated output. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
423 |
* @param expectedFound true if all of the files are expected |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
424 |
* to be found, or false if all of the files are expected to be |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
425 |
* not found |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
426 |
* @param paths the files to check, within the most recent output directory. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
427 |
* */ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
428 |
public void checkFiles(boolean expectedFound, String... paths) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
429 |
for (String path: paths) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
430 |
// log.logCheckFile(path, expectedFound); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
431 |
checking("checkFile"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
432 |
File file = new File(outputDir, path); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
433 |
boolean isFound = file.exists(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
434 |
if (isFound == expectedFound) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
435 |
passed(path + ": " + (isFound ? "found:" : "not found:") + "\n"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
436 |
} else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
437 |
failed(path + ": " + (isFound ? "found:" : "not found:") + "\n"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
438 |
} |
10 | 439 |
} |
440 |
} |
|
441 |
||
442 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
443 |
* Check that a series of strings are found in order in a file in |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
444 |
* the generated output. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
445 |
* @param path the file to check |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
446 |
* @param strings the strings whose order to check |
24072 | 447 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
448 |
public void checkOrder(String path, String... strings) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
449 |
String fileString = readOutputFile(path); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
450 |
int prevIndex = -1; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
451 |
for (String s : strings) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
452 |
int currentIndex = fileString.indexOf(s); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
453 |
checking(s + " at index " + currentIndex); |
25004
b33effe4f252
8042829: [javadoc] index-file output is not sorted correctly
ksrini
parents:
24399
diff
changeset
|
454 |
if (currentIndex == -1) { |
b33effe4f252
8042829: [javadoc] index-file output is not sorted correctly
ksrini
parents:
24399
diff
changeset
|
455 |
failed(s + " not found."); |
b33effe4f252
8042829: [javadoc] index-file output is not sorted correctly
ksrini
parents:
24399
diff
changeset
|
456 |
continue; |
b33effe4f252
8042829: [javadoc] index-file output is not sorted correctly
ksrini
parents:
24399
diff
changeset
|
457 |
} |
b33effe4f252
8042829: [javadoc] index-file output is not sorted correctly
ksrini
parents:
24399
diff
changeset
|
458 |
if (currentIndex > prevIndex) { |
b33effe4f252
8042829: [javadoc] index-file output is not sorted correctly
ksrini
parents:
24399
diff
changeset
|
459 |
passed(s + " is in the correct order"); |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
460 |
} else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
461 |
failed(s + " is in the wrong order."); |
10 | 462 |
} |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
463 |
prevIndex = currentIndex; |
10 | 464 |
} |
465 |
} |
|
466 |
||
467 |
/** |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
468 |
* Compare a set of files in each of two directories. |
10 | 469 |
* |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
470 |
* @param baseDir1 the directory containing the first set of files |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
471 |
* @param baseDir2 the directory containing the second set of files |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
472 |
* @param files the set of files to be compared |
10 | 473 |
*/ |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
474 |
public void diff(String baseDir1, String baseDir2, String... files) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
475 |
File bd1 = new File(baseDir1); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
476 |
File bd2 = new File(baseDir2); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
477 |
for (String file : files) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
478 |
diff(bd1, bd2, file); |
10 | 479 |
} |
480 |
} |
|
481 |
||
482 |
/** |
|
483 |
* A utility to copy a directory from one place to another. |
|
484 |
* |
|
485 |
* @param targetDir the directory to copy. |
|
486 |
* @param destDir the destination to copy the directory to. |
|
487 |
*/ |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
488 |
// TODO: convert to using java.nio.Files.walkFileTree |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
489 |
public void copyDir(String targetDir, String destDir) { |
10 | 490 |
try { |
491 |
File targetDirObj = new File(targetDir); |
|
492 |
File destDirParentObj = new File(destDir); |
|
493 |
File destDirObj = new File(destDirParentObj, targetDirObj.getName()); |
|
494 |
if (! destDirParentObj.exists()) { |
|
495 |
destDirParentObj.mkdir(); |
|
496 |
} |
|
497 |
if (! destDirObj.exists()) { |
|
498 |
destDirObj.mkdir(); |
|
499 |
} |
|
500 |
String[] files = targetDirObj.list(); |
|
24072 | 501 |
for (String file : files) { |
502 |
File srcFile = new File(targetDirObj, file); |
|
503 |
File destFile = new File(destDirObj, file); |
|
10 | 504 |
if (srcFile.isFile()) { |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
505 |
out.println("Copying " + srcFile + " to " + destFile); |
24072 | 506 |
copyFile(destFile, srcFile); |
10 | 507 |
} else if(srcFile.isDirectory()) { |
508 |
copyDir(srcFile.getAbsolutePath(), destDirObj.getAbsolutePath()); |
|
509 |
} |
|
510 |
} |
|
511 |
} catch (IOException exc) { |
|
512 |
throw new Error("Could not copy " + targetDir + " to " + destDir); |
|
513 |
} |
|
514 |
} |
|
515 |
||
516 |
/** |
|
517 |
* Copy source file to destination file. |
|
518 |
* |
|
24072 | 519 |
* @param destfile the destination file |
520 |
* @param srcfile the source file |
|
10 | 521 |
* @throws IOException |
522 |
*/ |
|
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
523 |
public void copyFile(File destfile, File srcfile) throws IOException { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
524 |
Files.copy(srcfile.toPath(), destfile.toPath()); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
525 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
526 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
527 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
528 |
* Read a file from the output directory. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
529 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
530 |
* @param fileName the name of the file to read |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
531 |
* @return the file in string format |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
532 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
533 |
public String readOutputFile(String fileName) throws Error { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
534 |
return readFile(outputDir, fileName); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
535 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
536 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
537 |
protected String readFile(String fileName) throws Error { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
538 |
return readFile(outputDir, fileName); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
539 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
540 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
541 |
protected String readFile(String baseDir, String fileName) throws Error { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
542 |
return readFile(new File(baseDir), fileName); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
543 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
544 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
545 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
546 |
* Read the file and return it as a string. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
547 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
548 |
* @param baseDir the directory in which to locate the file |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
549 |
* @param fileName the name of the file to read |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
550 |
* @return the file in string format |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
551 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
552 |
private String readFile(File baseDir, String fileName) throws Error { |
10 | 553 |
try { |
24399
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
554 |
File file = new File(baseDir, fileName); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
555 |
SoftReference<String> ref = fileContentCache.get(file); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
556 |
String content = (ref == null) ? null : ref.get(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
557 |
if (content != null) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
558 |
return content; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
559 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
560 |
content = new String(Files.readAllBytes(file.toPath())); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
561 |
fileContentCache.put(file, new SoftReference(content)); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
562 |
return content; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
563 |
} catch (FileNotFoundException e) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
564 |
System.err.println(e); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
565 |
throw new Error("File not found: " + fileName); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
566 |
} catch (IOException e) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
567 |
System.err.println(e); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
568 |
throw new Error("Error reading file: " + fileName); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
569 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
570 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
571 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
572 |
protected void checking(String message) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
573 |
numTestsRun++; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
574 |
print("Starting subtest " + numTestsRun, message); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
575 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
576 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
577 |
protected void passed(String message) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
578 |
numTestsPassed++; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
579 |
print("Passed", message); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
580 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
581 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
582 |
protected void failed(String message) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
583 |
print("FAILED", message); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
584 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
585 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
586 |
private void print(String prefix, String message) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
587 |
if (message.isEmpty()) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
588 |
out.println(prefix); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
589 |
else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
590 |
out.print(prefix); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
591 |
out.print(": "); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
592 |
out.println(message.replace("\n", NL)); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
593 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
594 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
595 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
596 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
597 |
* Print a summary of the test results. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
598 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
599 |
protected void printSummary() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
600 |
// log.write(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
601 |
if (numTestsRun != 0 && numTestsPassed == numTestsRun) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
602 |
// Test passed |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
603 |
out.println(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
604 |
out.println("All " + numTestsPassed + " subtests passed"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
605 |
} else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
606 |
// Test failed |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
607 |
throw new Error((numTestsRun - numTestsPassed) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
608 |
+ " of " + (numTestsRun) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
609 |
+ " subtests failed"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
610 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
611 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
612 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
613 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
614 |
* Search for the string in the given file and return true |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
615 |
* if the string was found. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
616 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
617 |
* @param fileString the contents of the file to search through |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
618 |
* @param stringToFind the string to search for |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
619 |
* @return true if the string was found |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
620 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
621 |
private boolean findString(String fileString, String stringToFind) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
622 |
// javadoc (should) always use the platform newline sequence, |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
623 |
// but in the strings to find it is more convenient to use the Java |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
624 |
// newline character. So we translate \n to NL before we search. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
625 |
stringToFind = stringToFind.replace("\n", NL); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
626 |
return fileString.contains(stringToFind); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
627 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
628 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
629 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
630 |
* Compare the two given files. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
631 |
* |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
632 |
* @param baseDir1 the directory in which to locate the first file |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
633 |
* @param baseDir2 the directory in which to locate the second file |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
634 |
* @param file the file to compare in the two base directories |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
635 |
* @param throwErrorIFNoMatch flag to indicate whether or not to throw |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
636 |
* an error if the files do not match. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
637 |
* @return true if the files are the same and false otherwise. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
638 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
639 |
private void diff(File baseDir1, File baseDir2, String file) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
640 |
String file1Contents = readFile(baseDir1, file); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
641 |
String file2Contents = readFile(baseDir2, file); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
642 |
checking("diff " + new File(baseDir1, file) + ", " + new File(baseDir2, file)); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
643 |
if (file1Contents.trim().compareTo(file2Contents.trim()) == 0) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
644 |
passed("files are equal"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
645 |
} else { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
646 |
failed("files differ"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
647 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
648 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
649 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
650 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
651 |
* Utility class to simplify the handling of temporarily setting a |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
652 |
* new stream for System.out or System.err. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
653 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
654 |
private static class StreamOutput { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
655 |
// functional interface to set a stream. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
656 |
private interface Initializer { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
657 |
void set(PrintStream s); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
658 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
659 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
660 |
private final ByteArrayOutputStream baos = new ByteArrayOutputStream(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
661 |
private final PrintStream ps = new PrintStream(baos); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
662 |
private final PrintStream prev; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
663 |
private final Initializer init; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
664 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
665 |
StreamOutput(PrintStream s, Initializer init) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
666 |
prev = s; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
667 |
init.set(ps); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
668 |
this.init = init; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
669 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
670 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
671 |
String close() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
672 |
init.set(prev); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
673 |
ps.close(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
674 |
return baos.toString(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
675 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
676 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
677 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
678 |
/** |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
679 |
* Utility class to simplify the handling of creating an in-memory PrintWriter. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
680 |
*/ |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
681 |
private static class WriterOutput { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
682 |
private final StringWriter sw = new StringWriter(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
683 |
final PrintWriter pw = new PrintWriter(sw); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
684 |
String close() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
685 |
pw.close(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
686 |
return sw.toString(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
687 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
688 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
689 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
690 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
691 |
// private final Logger log = new Logger(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
692 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
693 |
//--------- Logging -------------------------------------------------------- |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
694 |
// |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
695 |
// This class writes out the details of calls to checkOutput and checkFile |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
696 |
// in a canonical way, so that the resulting file can be checked against |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
697 |
// similar files from other versions of JavadocTester using the same logging |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
698 |
// facilities. |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
699 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
700 |
static class Logger { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
701 |
private static final int PREFIX = 40; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
702 |
private static final int SUFFIX = 20; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
703 |
private static final int MAX = PREFIX + SUFFIX; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
704 |
List<String> tests = new ArrayList<>(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
705 |
String outDir; |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
706 |
String rootDir = rootDir(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
707 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
708 |
static String rootDir() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
709 |
File f = new File(".").getAbsoluteFile(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
710 |
while (!new File(f, ".hg").exists()) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
711 |
f = f.getParentFile(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
712 |
return f.getPath(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
713 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
714 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
715 |
void setOutDir(File outDir) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
716 |
this.outDir = outDir.getPath(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
717 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
718 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
719 |
void logCheckFile(String file, boolean positive) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
720 |
// Strip the outdir because that will typically not be the same |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
721 |
if (file.startsWith(outDir + "/")) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
722 |
file = file.substring(outDir.length() + 1); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
723 |
tests.add(file + " " + positive); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
724 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
725 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
726 |
void logCheckOutput(String file, boolean positive, String text) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
727 |
// Compress the string to be displayed in the log file |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
728 |
String simpleText = text.replaceAll("\\s+", " ").replace(rootDir, "[ROOT]"); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
729 |
if (simpleText.length() > MAX) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
730 |
simpleText = simpleText.substring(0, PREFIX) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
731 |
+ "..." + simpleText.substring(simpleText.length() - SUFFIX); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
732 |
// Strip the outdir because that will typically not be the same |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
733 |
if (file.startsWith(outDir + "/")) |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
734 |
file = file.substring(outDir.length() + 1); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
735 |
// The use of text.hashCode ensure that all of "text" is taken into account |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
736 |
tests.add(file + " " + positive + " " + text.hashCode() + " " + simpleText); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
737 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
738 |
|
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
739 |
void write() { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
740 |
// sort the log entries because the subtests may not be executed in the same order |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
741 |
tests.sort((a, b) -> a.compareTo(b)); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
742 |
try (BufferedWriter bw = new BufferedWriter(new FileWriter("tester.log"))) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
743 |
for (String t: tests) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
744 |
bw.write(t); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
745 |
bw.newLine(); |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
746 |
} |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
747 |
} catch (IOException e) { |
af1a0220d0fa
8038730: Clean up the way JavadocTester is invoked, and checks for errors.
jjg
parents:
24217
diff
changeset
|
748 |
throw new Error("problem writing log: " + e); |
10 | 749 |
} |
750 |
} |
|
751 |
} |
|
752 |
} |