1.1 --- a/test/tools/javac/api/TestJavacTaskScanner.java Wed May 27 22:34:43 2009 -0700
1.2 +++ b/test/tools/javac/api/TestJavacTaskScanner.java Thu May 28 09:49:56 2009 -0700
1.3 @@ -26,7 +26,7 @@
1.4 * @bug 4813736
1.5 * @summary Additional functionality test of task and JSR 269
1.6 * @author Peter von der Ah\u00e9
1.7 - * @ignore "misuse" of context breaks with 6358786
1.8 + * @library ./lib
1.9 * @run main TestJavacTaskScanner TestJavacTaskScanner.java
1.10 */
1.11
1.12 @@ -42,16 +42,23 @@
1.13 import javax.lang.model.util.Elements;
1.14 import javax.lang.model.util.Types;
1.15 import javax.tools.*;
1.16 -import javax.tools.JavaFileManager;
1.17
1.18 -public class TestJavacTaskScanner implements Runnable {
1.19 +public class TestJavacTaskScanner extends ToolTester {
1.20
1.21 final JavacTaskImpl task;
1.22 final Elements elements;
1.23 final Types types;
1.24
1.25 - TestJavacTaskScanner(JavacTaskImpl task) {
1.26 - this.task = task;
1.27 + int numTokens;
1.28 + int numParseTypeElements;
1.29 + int numAllMembers;
1.30 +
1.31 + TestJavacTaskScanner(File file) {
1.32 + final Iterable<? extends JavaFileObject> compilationUnits =
1.33 + fm.getJavaFileObjects(new File[] {file});
1.34 + task = (JavacTaskImpl)tool.getTask(null, fm, null, null, null, compilationUnits);
1.35 + task.getContext().put(Scanner.Factory.scannerFactoryKey,
1.36 + new MyScanner.Factory(task.getContext(), this));
1.37 elements = task.getElements();
1.38 types = task.getTypes();
1.39 }
1.40 @@ -71,6 +78,23 @@
1.41 System.out.println();
1.42 System.out.println();
1.43 }
1.44 +
1.45 + System.out.println("#tokens: " + numTokens);
1.46 + System.out.println("#parseTypeElements: " + numParseTypeElements);
1.47 + System.out.println("#allMembers: " + numAllMembers);
1.48 +
1.49 + check(numTokens, "#Tokens", 891);
1.50 + check(numParseTypeElements, "#parseTypeElements", 136);
1.51 + check(numAllMembers, "#allMembers", 67);
1.52 + }
1.53 +
1.54 + void check(int value, String name, int expected) {
1.55 + // allow some slop in the comparison to allow for minor edits in the
1.56 + // test and in the platform
1.57 + if (value < expected * 9 / 10)
1.58 + throw new Error(name + " lower than expected; expected " + expected + "; found: " + value);
1.59 + if (value > expected * 11 / 10)
1.60 + throw new Error(name + " higher than expected; expected " + expected + "; found: " + value);
1.61 }
1.62
1.63 void testParseType(TypeElement clazz) {
1.64 @@ -78,23 +102,19 @@
1.65 for (Element member : elements.getAllMembers((TypeElement)type.asElement())) {
1.66 TypeMirror mt = types.asMemberOf(type, member);
1.67 System.out.format("%s : %s -> %s%n", member.getSimpleName(), member.asType(), mt);
1.68 + numParseTypeElements++;
1.69 }
1.70 }
1.71
1.72 public static void main(String... args) throws IOException {
1.73 - JavaCompilerTool tool = ToolProvider.defaultJavaCompiler();
1.74 - JavaFileManager fm = tool.getStandardFileManager();
1.75 String srcdir = System.getProperty("test.src");
1.76 - File file = new File(srcdir, args[0]);
1.77 - JavacTaskImpl task = (JavacTaskImpl)tool.run(null, fm.getFileForInput(file.toString()));
1.78 - MyScanner.Factory.preRegister(task.getContext());
1.79 - TestJavacTaskScanner tester = new TestJavacTaskScanner(task);
1.80 - tester.run();
1.81 + new TestJavacTaskScanner(new File(srcdir, args[0])).run();
1.82 }
1.83
1.84 private void testGetAllMembers(TypeElement clazz) {
1.85 for (Element member : elements.getAllMembers(clazz)) {
1.86 - System.out.format("%s : %s", member.getSimpleName(), member.asType());
1.87 + System.out.format("%s : %s%n", member.getSimpleName(), member.asType());
1.88 + numAllMembers++;
1.89 }
1.90 }
1.91 }
1.92 @@ -102,21 +122,15 @@
1.93 class MyScanner extends Scanner {
1.94
1.95 public static class Factory extends Scanner.Factory {
1.96 - public static void preRegister(final Context context) {
1.97 - context.put(scannerFactoryKey, new Context.Factory<Scanner.Factory>() {
1.98 - public Factory make() {
1.99 - return new Factory(context);
1.100 - }
1.101 - });
1.102 - }
1.103 - public Factory(Context context) {
1.104 + public Factory(Context context, TestJavacTaskScanner test) {
1.105 super(context);
1.106 + this.test = test;
1.107 }
1.108
1.109 @Override
1.110 public Scanner newScanner(CharSequence input) {
1.111 if (input instanceof CharBuffer) {
1.112 - return new MyScanner(this, (CharBuffer)input);
1.113 + return new MyScanner(this, (CharBuffer)input, test);
1.114 } else {
1.115 char[] array = input.toString().toCharArray();
1.116 return newScanner(array, array.length);
1.117 @@ -125,18 +139,26 @@
1.118
1.119 @Override
1.120 public Scanner newScanner(char[] input, int inputLength) {
1.121 - return new MyScanner(this, input, inputLength);
1.122 + return new MyScanner(this, input, inputLength, test);
1.123 }
1.124 +
1.125 + private TestJavacTaskScanner test;
1.126 }
1.127 - protected MyScanner(Factory fac, CharBuffer buffer) {
1.128 + protected MyScanner(Factory fac, CharBuffer buffer, TestJavacTaskScanner test) {
1.129 super(fac, buffer);
1.130 + this.test = test;
1.131 }
1.132 - protected MyScanner(Factory fac, char[] input, int inputLength) {
1.133 + protected MyScanner(Factory fac, char[] input, int inputLength, TestJavacTaskScanner test) {
1.134 super(fac, input, inputLength);
1.135 + this.test = test;
1.136 }
1.137
1.138 public void nextToken() {
1.139 super.nextToken();
1.140 System.err.format("Saw token %s (%s)%n", token(), name());
1.141 + test.numTokens++;
1.142 }
1.143 +
1.144 + private TestJavacTaskScanner test;
1.145 +
1.146 }
