1.1 --- a/test/tools/javac/tree/SourceTreeScannerTest.java Thu Sep 16 09:56:25 2010 -0700
1.2 +++ b/test/tools/javac/tree/SourceTreeScannerTest.java Thu Sep 16 09:57:37 2010 -0700
1.3 @@ -91,12 +91,13 @@
1.4 scan(tree, null);
1.5 expect = new HashSet<Tree>();
1.6 reflectiveScan(tree);
1.7 +
1.8 if (found.equals(expect)) {
1.9 - System.err.println(found.size() + " trees compared OK");
1.10 + //System.err.println(sourcefile.getName() + ": trees compared OK");
1.11 return found.size();
1.12 }
1.13
1.14 - error("Differences found for " + tree.sourcefile.getName());
1.15 + error(sourcefile.getName() + ": differences found");
1.16
1.17 if (found.size() != expect.size())
1.18 error("Size mismatch; found: " + found.size() + ", expected: " + expect.size());
1.19 @@ -105,13 +106,13 @@
1.20 missing.addAll(expect);
1.21 missing.removeAll(found);
1.22 for (Tree t: missing)
1.23 - error(tree.sourcefile, t, "missing");
1.24 + error(sourcefile, t, "missing");
1.25
1.26 Set<Tree> excess = new HashSet<Tree>();
1.27 excess.addAll(found);
1.28 excess.removeAll(expect);
1.29 for (Tree t: excess)
1.30 - error(tree.sourcefile, t, "unexpected");
1.31 + error(sourcefile, t, "unexpected");
1.32
1.33 return 0;
1.34 }
1.35 @@ -121,7 +122,7 @@
1.36 public Void scan(Tree tree, Void ignore) {
1.37 if (tree == null)
1.38 return null;
1.39 - System.err.println("FOUND: " + tree.getKind() + " " + trim(tree, 64));
1.40 + //System.err.println("FOUND: " + tree.getKind() + " " + trim(tree, 64));
1.41 found.add(tree);
1.42 return super.scan(tree, ignore);
1.43 }
1.44 @@ -132,7 +133,7 @@
1.45 return;
1.46 if (o instanceof JCTree) {
1.47 JCTree tree = (JCTree) o;
1.48 - System.err.println("EXPECT: " + tree.getKind() + " " + trim(tree, 64));
1.49 + //System.err.println("EXPECT: " + tree.getKind() + " " + trim(tree, 64));
1.50 expect.add(tree);
1.51 for (Field f: getFields(tree)) {
1.52 if (TypeBoundKind.class.isAssignableFrom(f.getType())) {
