author | chegar |
Thu, 17 Oct 2019 20:54:25 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58679 | 9c3209ff7550 |
parent 58678 | 9cf78a70fa4f |
parent 57724 | 447d48371b41 |
permissions | -rw-r--r-- |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1 |
/* |
53878
4584d0331318
8219254: Update explicit uses of latest source/target in langtools tests to a property
darcy
parents:
53023
diff
changeset
|
2 |
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
4 |
* |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
8 |
* |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
13 |
* accompanied this code). |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
14 |
* |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
18 |
* |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
21 |
* questions. |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
22 |
*/ |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
23 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
24 |
/* |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
25 |
* @test |
50898
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
26 |
* @bug 7073631 7159445 7156633 8028235 8065753 8205418 8205913 |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
27 |
* @summary tests error and diagnostics positions |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
28 |
* @author Jan Lahoda |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27992
diff
changeset
|
29 |
* @modules jdk.compiler/com.sun.tools.javac.api |
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27992
diff
changeset
|
30 |
* jdk.compiler/com.sun.tools.javac.main |
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
27992
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.tree |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
32 |
*/ |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
33 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
34 |
import com.sun.source.tree.BinaryTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
35 |
import com.sun.source.tree.BlockTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
36 |
import com.sun.source.tree.ClassTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
37 |
import com.sun.source.tree.CompilationUnitTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
38 |
import com.sun.source.tree.ErroneousTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
39 |
import com.sun.source.tree.ExpressionStatementTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
40 |
import com.sun.source.tree.ExpressionTree; |
47439
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
41 |
import com.sun.source.tree.IfTree; |
22155
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
42 |
import com.sun.source.tree.LambdaExpressionTree; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
43 |
import com.sun.source.tree.MethodInvocationTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
44 |
import com.sun.source.tree.MethodTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
45 |
import com.sun.source.tree.ModifiersTree; |
22155
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
46 |
import com.sun.source.tree.PrimitiveTypeTree; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
47 |
import com.sun.source.tree.StatementTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
48 |
import com.sun.source.tree.Tree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
49 |
import com.sun.source.tree.Tree.Kind; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
50 |
import com.sun.source.tree.VariableTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
51 |
import com.sun.source.tree.WhileLoopTree; |
50868 | 52 |
import com.sun.source.util.JavacTask; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
53 |
import com.sun.source.util.SourcePositions; |
50898
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
54 |
import com.sun.source.util.TreePath; |
50868 | 55 |
import com.sun.source.util.TreePathScanner; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
56 |
import com.sun.source.util.TreeScanner; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
57 |
import com.sun.source.util.Trees; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
58 |
import com.sun.tools.javac.api.JavacTaskImpl; |
27989 | 59 |
import com.sun.tools.javac.main.Main; |
27992 | 60 |
import com.sun.tools.javac.main.Main.Result; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
61 |
import com.sun.tools.javac.tree.JCTree; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
62 |
import java.io.IOException; |
27989 | 63 |
import java.io.StringWriter; |
13074 | 64 |
import java.lang.annotation.ElementType; |
65 |
import java.lang.annotation.Retention; |
|
66 |
import java.lang.annotation.RetentionPolicy; |
|
67 |
import java.lang.annotation.Target; |
|
68 |
import java.lang.reflect.Method; |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
69 |
import java.net.URI; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
70 |
import java.util.ArrayList; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
71 |
import java.util.Arrays; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
72 |
import java.util.LinkedList; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
73 |
import java.util.List; |
13074 | 74 |
import java.util.regex.Pattern; |
22155
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
75 |
import javax.lang.model.type.TypeKind; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
76 |
import javax.tools.Diagnostic; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
77 |
import javax.tools.DiagnosticCollector; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
78 |
import javax.tools.DiagnosticListener; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
79 |
import javax.tools.JavaCompiler; |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
80 |
import javax.tools.JavaFileManager; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
81 |
import javax.tools.JavaFileObject; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
82 |
import javax.tools.SimpleJavaFileObject; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
83 |
import javax.tools.ToolProvider; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
84 |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
85 |
import com.sun.source.tree.CaseTree; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
86 |
import com.sun.source.util.TreePathScanner; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
87 |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
88 |
public class JavacParserTest extends TestCase { |
13074 | 89 |
static final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
90 |
static final JavaFileManager fm = tool.getStandardFileManager(null, null, null); |
53878
4584d0331318
8219254: Update explicit uses of latest source/target in langtools tests to a property
darcy
parents:
53023
diff
changeset
|
91 |
public static final String SOURCE_VERSION = |
4584d0331318
8219254: Update explicit uses of latest source/target in langtools tests to a property
darcy
parents:
53023
diff
changeset
|
92 |
Integer.toString(Runtime.version().feature()); |
13074 | 93 |
|
94 |
private JavacParserTest(){} |
|
95 |
||
96 |
public static void main(String... args) throws Exception { |
|
53878
4584d0331318
8219254: Update explicit uses of latest source/target in langtools tests to a property
darcy
parents:
53023
diff
changeset
|
97 |
try (fm) { |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
98 |
new JavacParserTest().run(args); |
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
99 |
} |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
100 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
101 |
|
13074 | 102 |
class MyFileObject extends SimpleJavaFileObject { |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
103 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
104 |
private String text; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
105 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
106 |
public MyFileObject(String text) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
107 |
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
108 |
this.text = text; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
109 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
110 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
111 |
@Override |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
112 |
public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
113 |
return text; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
114 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
115 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
116 |
/* |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
117 |
* converts Windows to Unix style LFs for comparing strings |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
118 |
*/ |
13074 | 119 |
String normalize(String in) { |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
120 |
return in.replace(System.getProperty("line.separator"), "\n"); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
121 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
122 |
|
13074 | 123 |
CompilationUnitTree getCompilationUnitTree(String code) throws IOException { |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
124 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
125 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
126 |
null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
127 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
128 |
return cut; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
129 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
130 |
|
13074 | 131 |
List<String> getErroneousTreeValues(ErroneousTree node) { |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
132 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
133 |
List<String> values = new ArrayList<>(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
134 |
if (node.getErrorTrees() != null) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
135 |
for (Tree t : node.getErrorTrees()) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
136 |
values.add(t.toString()); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
137 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
138 |
} else { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
139 |
throw new RuntimeException("ERROR: No Erroneous tree " |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
140 |
+ "has been created."); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
141 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
142 |
return values; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
143 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
144 |
|
13074 | 145 |
@Test |
146 |
void testPositionForSuperConstructorCalls() throws IOException { |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
147 |
assert tool != null; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
148 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
149 |
String code = "package test; public class Test {public Test() {super();}}"; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
150 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
151 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
152 |
null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
153 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
154 |
SourcePositions pos = Trees.instance(ct).getSourcePositions(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
155 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
156 |
MethodTree method = |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
157 |
(MethodTree) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
158 |
ExpressionStatementTree es = |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
159 |
(ExpressionStatementTree) method.getBody().getStatements().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
160 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
161 |
final int esStartPos = code.indexOf(es.toString()); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
162 |
final int esEndPos = esStartPos + es.toString().length(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
163 |
assertEquals("testPositionForSuperConstructorCalls", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
164 |
esStartPos, pos.getStartPosition(cut, es)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
165 |
assertEquals("testPositionForSuperConstructorCalls", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
166 |
esEndPos, pos.getEndPosition(cut, es)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
167 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
168 |
MethodInvocationTree mit = (MethodInvocationTree) es.getExpression(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
169 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
170 |
final int mitStartPos = code.indexOf(mit.toString()); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
171 |
final int mitEndPos = mitStartPos + mit.toString().length(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
172 |
assertEquals("testPositionForSuperConstructorCalls", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
173 |
mitStartPos, pos.getStartPosition(cut, mit)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
174 |
assertEquals("testPositionForSuperConstructorCalls", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
175 |
mitEndPos, pos.getEndPosition(cut, mit)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
176 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
177 |
final int methodStartPos = mitStartPos; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
178 |
final int methodEndPos = methodStartPos + mit.getMethodSelect().toString().length(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
179 |
assertEquals("testPositionForSuperConstructorCalls", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
180 |
methodStartPos, pos.getStartPosition(cut, mit.getMethodSelect())); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
181 |
assertEquals("testPositionForSuperConstructorCalls", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
182 |
methodEndPos, pos.getEndPosition(cut, mit.getMethodSelect())); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
183 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
184 |
|
13074 | 185 |
@Test |
186 |
void testPositionForEnumModifiers() throws IOException { |
|
187 |
final String theString = "public"; |
|
188 |
String code = "package test; " + theString + " enum Test {A;}"; |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
189 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
190 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
191 |
null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
192 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
193 |
SourcePositions pos = Trees.instance(ct).getSourcePositions(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
194 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
195 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
196 |
ModifiersTree mt = clazz.getModifiers(); |
13074 | 197 |
int spos = code.indexOf(theString); |
198 |
int epos = spos + theString.length(); |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
199 |
assertEquals("testPositionForEnumModifiers", |
13074 | 200 |
spos, pos.getStartPosition(cut, mt)); |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
201 |
assertEquals("testPositionForEnumModifiers", |
13074 | 202 |
epos, pos.getEndPosition(cut, mt)); |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
203 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
204 |
|
13074 | 205 |
@Test |
206 |
void testNewClassWithEnclosing() throws IOException { |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
207 |
|
13074 | 208 |
final String theString = "Test.this.new d()"; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
209 |
String code = "package test; class Test { " + |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
210 |
"class d {} private void method() { " + |
13074 | 211 |
"Object o = " + theString + "; } }"; |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
212 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
213 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
214 |
null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
215 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
216 |
SourcePositions pos = Trees.instance(ct).getSourcePositions(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
217 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
218 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
219 |
ExpressionTree est = |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
220 |
((VariableTree) ((MethodTree) clazz.getMembers().get(1)).getBody().getStatements().get(0)).getInitializer(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
221 |
|
13074 | 222 |
final int spos = code.indexOf(theString); |
223 |
final int epos = spos + theString.length(); |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
224 |
assertEquals("testNewClassWithEnclosing", |
13074 | 225 |
spos, pos.getStartPosition(cut, est)); |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
226 |
assertEquals("testNewClassWithEnclosing", |
13074 | 227 |
epos, pos.getEndPosition(cut, est)); |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
228 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
229 |
|
13074 | 230 |
@Test |
231 |
void testPreferredPositionForBinaryOp() throws IOException { |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
232 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
233 |
String code = "package test; public class Test {" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
234 |
+ "private void test() {" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
235 |
+ "Object o = null; boolean b = o != null && o instanceof String;" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
236 |
+ "} private Test() {}}"; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
237 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
238 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
239 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
240 |
MethodTree method = (MethodTree) clazz.getMembers().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
241 |
VariableTree condSt = (VariableTree) method.getBody().getStatements().get(1); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
242 |
BinaryTree cond = (BinaryTree) condSt.getInitializer(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
243 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
244 |
JCTree condJC = (JCTree) cond; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
245 |
int condStartPos = code.indexOf("&&"); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
246 |
assertEquals("testPreferredPositionForBinaryOp", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
247 |
condStartPos, condJC.pos); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
248 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
249 |
|
13074 | 250 |
@Test |
251 |
void testErrorRecoveryForEnhancedForLoop142381() throws IOException { |
|
252 |
||
253 |
String code = "package test; class Test { " + |
|
254 |
"private void method() { " + |
|
255 |
"java.util.Set<String> s = null; for (a : s) {} } }"; |
|
256 |
||
257 |
final List<Diagnostic<? extends JavaFileObject>> errors = |
|
258 |
new LinkedList<Diagnostic<? extends JavaFileObject>>(); |
|
259 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
260 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, |
13074 | 261 |
new DiagnosticListener<JavaFileObject>() { |
262 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
|
263 |
errors.add(diagnostic); |
|
264 |
} |
|
265 |
}, null, null, Arrays.asList(new MyFileObject(code))); |
|
266 |
||
267 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
|
268 |
||
269 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
|
270 |
StatementTree forStatement = |
|
271 |
((MethodTree) clazz.getMembers().get(0)).getBody().getStatements().get(1); |
|
272 |
||
273 |
assertEquals("testErrorRecoveryForEnhancedForLoop142381", |
|
274 |
Kind.ENHANCED_FOR_LOOP, forStatement.getKind()); |
|
275 |
assertFalse("testErrorRecoveryForEnhancedForLoop142381", errors.isEmpty()); |
|
276 |
} |
|
277 |
||
278 |
@Test |
|
279 |
void testPositionAnnotationNoPackage187551() throws IOException { |
|
280 |
||
281 |
String code = "\n@interface Test {}"; |
|
282 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
283 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
13074 | 284 |
null, Arrays.asList(new MyFileObject(code))); |
285 |
||
286 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
|
287 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
|
288 |
Trees t = Trees.instance(ct); |
|
289 |
||
290 |
assertEquals("testPositionAnnotationNoPackage187551", |
|
291 |
1, t.getSourcePositions().getStartPosition(cut, clazz)); |
|
292 |
} |
|
293 |
||
294 |
@Test |
|
47439
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
295 |
void testPositionMissingStatement() throws IOException { |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
296 |
String code = "class C { void t() { if (true) } }"; |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
297 |
DiagnosticCollector<JavaFileObject> dc = new DiagnosticCollector<>(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
298 |
|
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
299 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, dc, null, |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
300 |
null, Arrays.asList(new MyFileObject(code))); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
301 |
|
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
302 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
303 |
Trees trees = Trees.instance(ct); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
304 |
SourcePositions positions = trees.getSourcePositions(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
305 |
|
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
306 |
new TreeScanner<Void, Void>() { |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
307 |
@Override |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
308 |
public Void visitIf(IfTree it, Void v) { |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
309 |
StatementTree st = it.getThenStatement(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
310 |
int startpos = (int) positions.getStartPosition(cut, st); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
311 |
int endpos = (int) positions.getEndPosition(cut, st); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
312 |
assertEquals("testPositionMissingStatement.execpos", startpos, endpos); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
313 |
assertEquals("testPositionMissingStatement.execkind", |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
314 |
Kind.EXPRESSION_STATEMENT, |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
315 |
st.getKind()); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
316 |
Tree err = ((ExpressionStatementTree) st).getExpression(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
317 |
startpos = (int) positions.getStartPosition(cut, err); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
318 |
endpos = (int) positions.getEndPosition(cut, err); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
319 |
assertEquals("testPositionMissingStatement.errpos", startpos, endpos); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
320 |
assertEquals("testPositionMissingStatement.errkind", |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
321 |
Kind.ERRONEOUS, |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
322 |
err.getKind()); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
323 |
return super.visitIf(it, v); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
324 |
} |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
325 |
}.scan(cut, null); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
326 |
|
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
327 |
assertEquals("testPositionMissingStatement.diags", 1, dc.getDiagnostics().size()); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
328 |
Diagnostic<? extends JavaFileObject> d = dc.getDiagnostics().get(0); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
329 |
int startpos = (int) d.getStartPosition(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
330 |
int pos = (int) d.getPosition(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
331 |
int endpos = (int) d.getEndPosition(); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
332 |
assertEquals("testPositionMissingStatement.diagspan", startpos, endpos); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
333 |
assertEquals("testPositionMissingStatement.diagpref", startpos, pos); |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
334 |
} |
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
335 |
|
94943e6674be
8189796: Incorrect end position for missing statement
jlahoda
parents:
47216
diff
changeset
|
336 |
@Test |
13074 | 337 |
void testPositionsSane1() throws IOException { |
338 |
performPositionsSanityTest("package test; class Test { " + |
|
339 |
"private void method() { " + |
|
340 |
"java.util.List<? extends java.util.List<? extends String>> l; " + |
|
341 |
"} }"); |
|
342 |
} |
|
343 |
||
344 |
@Test |
|
345 |
void testPositionsSane2() throws IOException { |
|
346 |
performPositionsSanityTest("package test; class Test { " + |
|
347 |
"private void method() { " + |
|
348 |
"java.util.List<? super java.util.List<? super String>> l; " + |
|
349 |
"} }"); |
|
350 |
} |
|
351 |
||
352 |
@Test |
|
353 |
void testPositionsSane3() throws IOException { |
|
354 |
performPositionsSanityTest("package test; class Test { " + |
|
355 |
"private void method() { " + |
|
356 |
"java.util.List<? super java.util.List<?>> l; } }"); |
|
357 |
} |
|
358 |
||
359 |
private void performPositionsSanityTest(String code) throws IOException { |
|
360 |
||
361 |
final List<Diagnostic<? extends JavaFileObject>> errors = |
|
362 |
new LinkedList<Diagnostic<? extends JavaFileObject>>(); |
|
363 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
364 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, |
13074 | 365 |
new DiagnosticListener<JavaFileObject>() { |
366 |
||
367 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
|
368 |
errors.add(diagnostic); |
|
369 |
} |
|
370 |
}, null, null, Arrays.asList(new MyFileObject(code))); |
|
371 |
||
372 |
final CompilationUnitTree cut = ct.parse().iterator().next(); |
|
373 |
final Trees trees = Trees.instance(ct); |
|
374 |
||
375 |
new TreeScanner<Void, Void>() { |
|
376 |
||
377 |
private long parentStart = 0; |
|
378 |
private long parentEnd = Integer.MAX_VALUE; |
|
379 |
||
380 |
@Override |
|
381 |
public Void scan(Tree node, Void p) { |
|
382 |
if (node == null) { |
|
383 |
return null; |
|
384 |
} |
|
385 |
||
386 |
long start = trees.getSourcePositions().getStartPosition(cut, node); |
|
387 |
||
388 |
if (start == (-1)) { |
|
389 |
return null; // synthetic tree |
|
390 |
} |
|
391 |
assertTrue(node.toString() + ":" + start + "/" + parentStart, |
|
392 |
parentStart <= start); |
|
393 |
||
394 |
long prevParentStart = parentStart; |
|
395 |
||
396 |
parentStart = start; |
|
397 |
||
398 |
long end = trees.getSourcePositions().getEndPosition(cut, node); |
|
399 |
||
400 |
assertTrue(node.toString() + ":" + end + "/" + parentEnd, |
|
401 |
end <= parentEnd); |
|
402 |
||
403 |
long prevParentEnd = parentEnd; |
|
404 |
||
405 |
parentEnd = end; |
|
406 |
||
407 |
super.scan(node, p); |
|
408 |
||
409 |
parentStart = prevParentStart; |
|
410 |
parentEnd = prevParentEnd; |
|
411 |
||
412 |
return null; |
|
413 |
} |
|
414 |
||
415 |
private void assertTrue(String message, boolean b) { |
|
416 |
if (!b) fail(message); |
|
417 |
} |
|
418 |
}.scan(cut, null); |
|
419 |
} |
|
420 |
||
421 |
@Test |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
422 |
void testCorrectWildcardPositions1() throws IOException { |
13074 | 423 |
performWildcardPositionsTest("package test; import java.util.List; " + |
424 |
"class Test { private void method() { List<? extends List<? extends String>> l; } }", |
|
425 |
||
426 |
Arrays.asList("List<? extends List<? extends String>> l;", |
|
427 |
"List<? extends List<? extends String>>", |
|
428 |
"List", |
|
429 |
"? extends List<? extends String>", |
|
430 |
"List<? extends String>", |
|
431 |
"List", |
|
432 |
"? extends String", |
|
433 |
"String")); |
|
434 |
} |
|
435 |
||
436 |
@Test |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
437 |
void testCorrectWildcardPositions2() throws IOException { |
13074 | 438 |
performWildcardPositionsTest("package test; import java.util.List; " |
439 |
+ "class Test { private void method() { List<? super List<? super String>> l; } }", |
|
440 |
Arrays.asList("List<? super List<? super String>> l;", |
|
441 |
"List<? super List<? super String>>", |
|
442 |
"List", |
|
443 |
"? super List<? super String>", |
|
444 |
"List<? super String>", |
|
445 |
"List", |
|
446 |
"? super String", |
|
447 |
"String")); |
|
448 |
} |
|
449 |
||
450 |
@Test |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
451 |
void testCorrectWildcardPositions3() throws IOException { |
13074 | 452 |
performWildcardPositionsTest("package test; import java.util.List; " + |
453 |
"class Test { private void method() { List<? super List<?>> l; } }", |
|
454 |
||
455 |
Arrays.asList("List<? super List<?>> l;", |
|
456 |
"List<? super List<?>>", |
|
457 |
"List", |
|
458 |
"? super List<?>", |
|
459 |
"List<?>", |
|
460 |
"List", |
|
461 |
"?")); |
|
462 |
} |
|
463 |
||
464 |
@Test |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
465 |
void testCorrectWildcardPositions4() throws IOException { |
13074 | 466 |
performWildcardPositionsTest("package test; import java.util.List; " + |
467 |
"class Test { private void method() { " + |
|
468 |
"List<? extends List<? extends List<? extends String>>> l; } }", |
|
469 |
||
470 |
Arrays.asList("List<? extends List<? extends List<? extends String>>> l;", |
|
471 |
"List<? extends List<? extends List<? extends String>>>", |
|
472 |
"List", |
|
473 |
"? extends List<? extends List<? extends String>>", |
|
474 |
"List<? extends List<? extends String>>", |
|
475 |
"List", |
|
476 |
"? extends List<? extends String>", |
|
477 |
"List<? extends String>", |
|
478 |
"List", |
|
479 |
"? extends String", |
|
480 |
"String")); |
|
481 |
} |
|
482 |
||
483 |
@Test |
|
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
484 |
void testCorrectWildcardPositions5() throws IOException { |
13074 | 485 |
performWildcardPositionsTest("package test; import java.util.List; " + |
486 |
"class Test { private void method() { " + |
|
487 |
"List<? extends List<? extends List<? extends String >>> l; } }", |
|
488 |
Arrays.asList("List<? extends List<? extends List<? extends String >>> l;", |
|
489 |
"List<? extends List<? extends List<? extends String >>>", |
|
490 |
"List", |
|
491 |
"? extends List<? extends List<? extends String >>", |
|
492 |
"List<? extends List<? extends String >>", |
|
493 |
"List", |
|
494 |
"? extends List<? extends String >", |
|
495 |
"List<? extends String >", |
|
496 |
"List", |
|
497 |
"? extends String", |
|
498 |
"String")); |
|
499 |
} |
|
500 |
||
501 |
void performWildcardPositionsTest(final String code, |
|
502 |
List<String> golden) throws IOException { |
|
503 |
||
504 |
final List<Diagnostic<? extends JavaFileObject>> errors = |
|
505 |
new LinkedList<Diagnostic<? extends JavaFileObject>>(); |
|
506 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
507 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, |
13074 | 508 |
new DiagnosticListener<JavaFileObject>() { |
509 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
|
510 |
errors.add(diagnostic); |
|
511 |
} |
|
512 |
}, null, null, Arrays.asList(new MyFileObject(code))); |
|
513 |
||
514 |
final CompilationUnitTree cut = ct.parse().iterator().next(); |
|
515 |
final List<String> content = new LinkedList<String>(); |
|
516 |
final Trees trees = Trees.instance(ct); |
|
517 |
||
518 |
new TreeScanner<Void, Void>() { |
|
519 |
@Override |
|
520 |
public Void scan(Tree node, Void p) { |
|
521 |
if (node == null) { |
|
522 |
return null; |
|
523 |
} |
|
524 |
long start = trees.getSourcePositions().getStartPosition(cut, node); |
|
525 |
||
526 |
if (start == (-1)) { |
|
527 |
return null; // synthetic tree |
|
528 |
} |
|
529 |
long end = trees.getSourcePositions().getEndPosition(cut, node); |
|
530 |
String s = code.substring((int) start, (int) end); |
|
531 |
content.add(s); |
|
532 |
||
533 |
return super.scan(node, p); |
|
534 |
} |
|
535 |
}.scan(((MethodTree) ((ClassTree) cut.getTypeDecls().get(0)).getMembers().get(0)).getBody().getStatements().get(0), null); |
|
536 |
||
537 |
assertEquals("performWildcardPositionsTest",golden.toString(), |
|
538 |
content.toString()); |
|
539 |
} |
|
540 |
||
541 |
@Test |
|
542 |
void testStartPositionForMethodWithoutModifiers() throws IOException { |
|
543 |
||
544 |
String code = "package t; class Test { <T> void t() {} }"; |
|
545 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
546 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
13074 | 547 |
null, Arrays.asList(new MyFileObject(code))); |
548 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
|
549 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
|
550 |
MethodTree mt = (MethodTree) clazz.getMembers().get(0); |
|
551 |
Trees t = Trees.instance(ct); |
|
552 |
int start = (int) t.getSourcePositions().getStartPosition(cut, mt); |
|
553 |
int end = (int) t.getSourcePositions().getEndPosition(cut, mt); |
|
554 |
||
555 |
assertEquals("testStartPositionForMethodWithoutModifiers", |
|
556 |
"<T> void t() {}", code.substring(start, end)); |
|
557 |
} |
|
558 |
||
559 |
@Test |
|
560 |
void testVariableInIfThen1() throws IOException { |
|
561 |
||
562 |
String code = "package t; class Test { " + |
|
563 |
"private static void t(String name) { " + |
|
564 |
"if (name != null) String nn = name.trim(); } }"; |
|
565 |
||
566 |
DiagnosticCollector<JavaFileObject> coll = |
|
567 |
new DiagnosticCollector<JavaFileObject>(); |
|
568 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
569 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null, |
13074 | 570 |
null, Arrays.asList(new MyFileObject(code))); |
571 |
||
572 |
ct.parse(); |
|
573 |
||
574 |
List<String> codes = new LinkedList<String>(); |
|
575 |
||
576 |
for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) { |
|
577 |
codes.add(d.getCode()); |
|
578 |
} |
|
579 |
||
580 |
assertEquals("testVariableInIfThen1", |
|
581 |
Arrays.<String>asList("compiler.err.variable.not.allowed"), |
|
582 |
codes); |
|
583 |
} |
|
584 |
||
585 |
@Test |
|
586 |
void testVariableInIfThen2() throws IOException { |
|
587 |
||
588 |
String code = "package t; class Test { " + |
|
589 |
"private static void t(String name) { " + |
|
590 |
"if (name != null) class X {} } }"; |
|
591 |
DiagnosticCollector<JavaFileObject> coll = |
|
592 |
new DiagnosticCollector<JavaFileObject>(); |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
593 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null, |
13074 | 594 |
null, Arrays.asList(new MyFileObject(code))); |
595 |
||
596 |
ct.parse(); |
|
597 |
||
598 |
List<String> codes = new LinkedList<String>(); |
|
599 |
||
600 |
for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) { |
|
601 |
codes.add(d.getCode()); |
|
602 |
} |
|
603 |
||
604 |
assertEquals("testVariableInIfThen2", |
|
605 |
Arrays.<String>asList("compiler.err.class.not.allowed"), codes); |
|
606 |
} |
|
607 |
||
608 |
@Test |
|
609 |
void testVariableInIfThen3() throws IOException { |
|
610 |
||
611 |
String code = "package t; class Test { "+ |
|
612 |
"private static void t() { " + |
|
613 |
"if (true) abstract class F {} }}"; |
|
614 |
DiagnosticCollector<JavaFileObject> coll = |
|
615 |
new DiagnosticCollector<JavaFileObject>(); |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
616 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null, |
13074 | 617 |
null, Arrays.asList(new MyFileObject(code))); |
618 |
||
619 |
ct.parse(); |
|
620 |
||
621 |
List<String> codes = new LinkedList<String>(); |
|
622 |
||
623 |
for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) { |
|
624 |
codes.add(d.getCode()); |
|
625 |
} |
|
626 |
||
627 |
assertEquals("testVariableInIfThen3", |
|
628 |
Arrays.<String>asList("compiler.err.class.not.allowed"), codes); |
|
629 |
} |
|
630 |
||
631 |
@Test |
|
632 |
void testVariableInIfThen4() throws IOException { |
|
633 |
||
634 |
String code = "package t; class Test { "+ |
|
635 |
"private static void t(String name) { " + |
|
636 |
"if (name != null) interface X {} } }"; |
|
637 |
DiagnosticCollector<JavaFileObject> coll = |
|
638 |
new DiagnosticCollector<JavaFileObject>(); |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
639 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null, |
13074 | 640 |
null, Arrays.asList(new MyFileObject(code))); |
641 |
||
642 |
ct.parse(); |
|
643 |
||
644 |
List<String> codes = new LinkedList<String>(); |
|
645 |
||
646 |
for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) { |
|
647 |
codes.add(d.getCode()); |
|
648 |
} |
|
649 |
||
650 |
assertEquals("testVariableInIfThen4", |
|
651 |
Arrays.<String>asList("compiler.err.class.not.allowed"), codes); |
|
652 |
} |
|
653 |
||
654 |
@Test |
|
655 |
void testVariableInIfThen5() throws IOException { |
|
656 |
||
657 |
String code = "package t; class Test { "+ |
|
658 |
"private static void t() { " + |
|
659 |
"if (true) } }"; |
|
660 |
DiagnosticCollector<JavaFileObject> coll = |
|
661 |
new DiagnosticCollector<JavaFileObject>(); |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
662 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null, |
13074 | 663 |
null, Arrays.asList(new MyFileObject(code))); |
664 |
||
665 |
ct.parse(); |
|
666 |
||
667 |
List<String> codes = new LinkedList<String>(); |
|
668 |
||
669 |
for (Diagnostic<? extends JavaFileObject> d : coll.getDiagnostics()) { |
|
670 |
codes.add(d.getCode()); |
|
671 |
} |
|
672 |
||
673 |
assertEquals("testVariableInIfThen5", |
|
674 |
Arrays.<String>asList("compiler.err.illegal.start.of.stmt"), |
|
675 |
codes); |
|
676 |
} |
|
677 |
||
678 |
// see javac bug #6882235, NB bug #98234: |
|
679 |
@Test |
|
680 |
void testMissingExponent() throws IOException { |
|
681 |
||
682 |
String code = "\nclass Test { { System.err.println(0e); } }"; |
|
683 |
||
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
684 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
13074 | 685 |
null, Arrays.asList(new MyFileObject(code))); |
686 |
||
687 |
assertNotNull(ct.parse().iterator().next()); |
|
688 |
} |
|
689 |
||
690 |
@Test |
|
691 |
void testTryResourcePos() throws IOException { |
|
692 |
||
693 |
final String code = "package t; class Test { " + |
|
694 |
"{ try (java.io.InputStream in = null) { } } }"; |
|
695 |
||
696 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
|
697 |
||
698 |
new TreeScanner<Void, Void>() { |
|
699 |
@Override |
|
700 |
public Void visitVariable(VariableTree node, Void p) { |
|
701 |
if ("in".contentEquals(node.getName())) { |
|
702 |
JCTree.JCVariableDecl var = (JCTree.JCVariableDecl) node; |
|
703 |
assertEquals("testTryResourcePos", "in = null) { } } }", |
|
704 |
code.substring(var.pos)); |
|
705 |
} |
|
706 |
return super.visitVariable(node, p); |
|
707 |
} |
|
708 |
}.scan(cut, null); |
|
709 |
} |
|
710 |
||
711 |
@Test |
|
712 |
void testVarPos() throws IOException { |
|
713 |
||
714 |
final String code = "package t; class Test { " + |
|
715 |
"{ java.io.InputStream in = null; } }"; |
|
716 |
||
717 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
|
718 |
||
719 |
new TreeScanner<Void, Void>() { |
|
720 |
||
721 |
@Override |
|
722 |
public Void visitVariable(VariableTree node, Void p) { |
|
723 |
if ("in".contentEquals(node.getName())) { |
|
724 |
JCTree.JCVariableDecl var = (JCTree.JCVariableDecl) node; |
|
725 |
assertEquals("testVarPos","in = null; } }", |
|
726 |
code.substring(var.pos)); |
|
727 |
} |
|
728 |
return super.visitVariable(node, p); |
|
729 |
} |
|
730 |
}.scan(cut, null); |
|
731 |
} |
|
732 |
||
733 |
// expected erroneous tree: int x = y;(ERROR); |
|
734 |
@Test |
|
735 |
void testOperatorMissingError() throws IOException { |
|
736 |
||
737 |
String code = "package test; public class ErrorTest { " |
|
738 |
+ "void method() { int x = y z } }"; |
|
739 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
|
740 |
final List<String> values = new ArrayList<>(); |
|
741 |
final List<String> expectedValues = |
|
742 |
new ArrayList<>(Arrays.asList("[z]")); |
|
743 |
||
744 |
new TreeScanner<Void, Void>() { |
|
745 |
@Override |
|
746 |
public Void visitErroneous(ErroneousTree node, Void p) { |
|
747 |
values.add(getErroneousTreeValues(node).toString()); |
|
748 |
return null; |
|
749 |
||
750 |
} |
|
751 |
}.scan(cut, null); |
|
752 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
753 |
assertEquals("testOperatorMissingError: The Erroneous tree " |
13074 | 754 |
+ "error values: " + values |
755 |
+ " do not match expected error values: " |
|
756 |
+ expectedValues, values, expectedValues); |
|
757 |
} |
|
758 |
||
759 |
// expected erroneous tree: String s = (ERROR); |
|
760 |
@Test |
|
761 |
void testMissingParenthesisError() throws IOException { |
|
762 |
||
763 |
String code = "package test; public class ErrorTest { " |
|
764 |
+ "void f() {String s = new String; } }"; |
|
765 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
|
766 |
final List<String> values = new ArrayList<>(); |
|
767 |
final List<String> expectedValues = |
|
768 |
new ArrayList<>(Arrays.asList("[new String()]")); |
|
769 |
||
770 |
new TreeScanner<Void, Void>() { |
|
771 |
@Override |
|
772 |
public Void visitErroneous(ErroneousTree node, Void p) { |
|
773 |
values.add(getErroneousTreeValues(node).toString()); |
|
774 |
return null; |
|
775 |
} |
|
776 |
}.scan(cut, null); |
|
777 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
778 |
assertEquals("testMissingParenthesisError: The Erroneous tree " |
13074 | 779 |
+ "error values: " + values |
780 |
+ " do not match expected error values: " |
|
781 |
+ expectedValues, values, expectedValues); |
|
782 |
} |
|
783 |
||
784 |
// expected erroneous tree: package test; (ERROR)(ERROR) |
|
785 |
@Test |
|
786 |
void testMissingClassError() throws IOException { |
|
787 |
||
788 |
String code = "package Test; clas ErrorTest { " |
|
789 |
+ "void f() {String s = new String(); } }"; |
|
790 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
|
791 |
final List<String> values = new ArrayList<>(); |
|
792 |
final List<String> expectedValues = |
|
793 |
new ArrayList<>(Arrays.asList("[, clas]", "[]")); |
|
794 |
||
795 |
new TreeScanner<Void, Void>() { |
|
796 |
@Override |
|
797 |
public Void visitErroneous(ErroneousTree node, Void p) { |
|
798 |
values.add(getErroneousTreeValues(node).toString()); |
|
799 |
return null; |
|
800 |
} |
|
801 |
}.scan(cut, null); |
|
802 |
||
42407
f3702cff2933
8169069: Module system implementation refresh (11/2016)
alanb
parents:
30730
diff
changeset
|
803 |
assertEquals("testMissingClassError: The Erroneous tree " |
13074 | 804 |
+ "error values: " + values |
805 |
+ " do not match expected error values: " |
|
806 |
+ expectedValues, values, expectedValues); |
|
807 |
} |
|
808 |
||
809 |
// expected erroneous tree: void m1(int i) {(ERROR);{(ERROR);} |
|
810 |
@Test |
|
811 |
void testSwitchError() throws IOException { |
|
812 |
||
813 |
String code = "package test; public class ErrorTest { " |
|
814 |
+ "int numDays; void m1(int i) { switchh {i} { case 1: " |
|
815 |
+ "numDays = 31; break; } } }"; |
|
816 |
CompilationUnitTree cut = getCompilationUnitTree(code); |
|
817 |
final List<String> values = new ArrayList<>(); |
|
818 |
final List<String> expectedValues = |
|
819 |
new ArrayList<>(Arrays.asList("[switchh]", "[i]")); |
|
820 |
||
821 |
new TreeScanner<Void, Void>() { |
|
822 |
@Override |
|
823 |
public Void visitErroneous(ErroneousTree node, Void p) { |
|
824 |
values.add(getErroneousTreeValues(node).toString()); |
|
825 |
return null; |
|
826 |
} |
|
827 |
}.scan(cut, null); |
|
828 |
||
829 |
assertEquals("testSwitchError: The Erroneous tree " |
|
830 |
+ "error values: " + values |
|
831 |
+ " do not match expected error values: " |
|
832 |
+ expectedValues, values, expectedValues); |
|
833 |
} |
|
834 |
||
835 |
// expected erroneous tree: class ErrorTest {(ERROR) |
|
836 |
@Test |
|
837 |
void testMethodError() throws IOException { |
|
838 |
||
839 |
String code = "package Test; class ErrorTest { " |
|
840 |
+ "static final void f) {String s = new String(); } }"; |
|
841 |
CompilationUnitTree cut = cut = getCompilationUnitTree(code); |
|
842 |
||
843 |
final List<String> values = new ArrayList<>(); |
|
844 |
final List<String> expectedValues = |
|
845 |
new ArrayList<>(Arrays.asList("[\nstatic final void f();]")); |
|
846 |
||
847 |
new TreeScanner<Void, Void>() { |
|
848 |
@Override |
|
849 |
public Void visitErroneous(ErroneousTree node, Void p) { |
|
850 |
values.add(normalize(getErroneousTreeValues(node).toString())); |
|
851 |
return null; |
|
852 |
} |
|
853 |
}.scan(cut, null); |
|
854 |
||
855 |
assertEquals("testMethodError: The Erroneous tree " |
|
856 |
+ "error value: " + values |
|
857 |
+ " does not match expected error values: " |
|
858 |
+ expectedValues, values, expectedValues); |
|
859 |
} |
|
860 |
||
861 |
/* |
|
862 |
* The following tests do not work just yet with nb-javac nor javac, |
|
863 |
* they need further investigation, see CR: 7167356 |
|
864 |
*/ |
|
865 |
||
866 |
void testPositionBrokenSource126732a() throws IOException { |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
867 |
String[] commands = new String[]{ |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
868 |
"return Runnable()", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
869 |
"do { } while (true)", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
870 |
"throw UnsupportedOperationException()", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
871 |
"assert true", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
872 |
"1 + 1",}; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
873 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
874 |
for (String command : commands) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
875 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
876 |
String code = "package test;\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
877 |
+ "public class Test {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
878 |
+ " public static void test() {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
879 |
+ " " + command + " {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
880 |
+ " new Runnable() {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
881 |
+ " };\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
882 |
+ " }\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
883 |
+ "}"; |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
884 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
885 |
null, null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
886 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
887 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
888 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
889 |
MethodTree method = (MethodTree) clazz.getMembers().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
890 |
List<? extends StatementTree> statements = |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
891 |
method.getBody().getStatements(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
892 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
893 |
StatementTree ret = statements.get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
894 |
StatementTree block = statements.get(1); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
895 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
896 |
Trees t = Trees.instance(ct); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
897 |
int len = code.indexOf(command + " {") + (command + " ").length(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
898 |
assertEquals(command, len, |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
899 |
t.getSourcePositions().getEndPosition(cut, ret)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
900 |
assertEquals(command, len, |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
901 |
t.getSourcePositions().getStartPosition(cut, block)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
902 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
903 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
904 |
|
13074 | 905 |
void testPositionBrokenSource126732b() throws IOException { |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
906 |
String[] commands = new String[]{ |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
907 |
"break", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
908 |
"break A", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
909 |
"continue ", |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
910 |
"continue A",}; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
911 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
912 |
for (String command : commands) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
913 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
914 |
String code = "package test;\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
915 |
+ "public class Test {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
916 |
+ " public static void test() {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
917 |
+ " while (true) {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
918 |
+ " " + command + " {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
919 |
+ " new Runnable() {\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
920 |
+ " };\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
921 |
+ " }\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
922 |
+ " }\n" |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
923 |
+ "}"; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
924 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
925 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
926 |
null, null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
927 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
928 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
929 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
930 |
MethodTree method = (MethodTree) clazz.getMembers().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
931 |
List<? extends StatementTree> statements = |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
932 |
((BlockTree) ((WhileLoopTree) method.getBody().getStatements().get(0)).getStatement()).getStatements(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
933 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
934 |
StatementTree ret = statements.get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
935 |
StatementTree block = statements.get(1); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
936 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
937 |
Trees t = Trees.instance(ct); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
938 |
int len = code.indexOf(command + " {") + (command + " ").length(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
939 |
assertEquals(command, len, |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
940 |
t.getSourcePositions().getEndPosition(cut, ret)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
941 |
assertEquals(command, len, |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
942 |
t.getSourcePositions().getStartPosition(cut, block)); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
943 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
944 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
945 |
|
13074 | 946 |
void testStartPositionEnumConstantInit() throws IOException { |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
947 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
948 |
String code = "package t; enum Test { AAA; }"; |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
949 |
|
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
950 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
951 |
null, Arrays.asList(new MyFileObject(code))); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
952 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
953 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
954 |
VariableTree enumAAA = (VariableTree) clazz.getMembers().get(0); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
955 |
Trees t = Trees.instance(ct); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
956 |
int start = (int) t.getSourcePositions().getStartPosition(cut, |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
957 |
enumAAA.getInitializer()); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
958 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
959 |
assertEquals("testStartPositionEnumConstantInit", -1, start); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
960 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
961 |
|
22155
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
962 |
@Test |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
963 |
void testVoidLambdaParameter() throws IOException { |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
964 |
String code = "package t; class Test { " + |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
965 |
"Runnable r = (void v) -> { };" + |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
966 |
"}"; |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
967 |
DiagnosticCollector<JavaFileObject> coll = |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
968 |
new DiagnosticCollector<>(); |
27388
d694da45bd7a
8062676: Tests which leak lots of file managers should be fixed (group 2)
jjg
parents:
22155
diff
changeset
|
969 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, coll, null, |
22155
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
970 |
null, Arrays.asList(new MyFileObject(code))); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
971 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
972 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
973 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
974 |
VariableTree field = (VariableTree) clazz.getMembers().get(0); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
975 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
976 |
assertEquals("actual kind: " + field.getInitializer().getKind(), |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
977 |
field.getInitializer().getKind(), |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
978 |
Kind.LAMBDA_EXPRESSION); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
979 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
980 |
LambdaExpressionTree lambda = (LambdaExpressionTree) field.getInitializer(); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
981 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
982 |
assertEquals("actual parameters: " + lambda.getParameters().size(), |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
983 |
lambda.getParameters().size(), |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
984 |
1); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
985 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
986 |
Tree paramType = lambda.getParameters().get(0).getType(); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
987 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
988 |
assertEquals("actual parameter type: " + paramType.getKind(), |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
989 |
paramType.getKind(), |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
990 |
Kind.PRIMITIVE_TYPE); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
991 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
992 |
TypeKind primitiveTypeKind = ((PrimitiveTypeTree) paramType).getPrimitiveTypeKind(); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
993 |
|
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
994 |
assertEquals("actual parameter type: " + primitiveTypeKind, |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
995 |
primitiveTypeKind, |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
996 |
TypeKind.VOID); |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
997 |
} |
2f0a83a98593
8028235: Better error recovery for parsing 'void' as a type of the lambda parameter
jlahoda
parents:
13074
diff
changeset
|
998 |
|
27989 | 999 |
@Test //JDK-8065753 |
1000 |
void testWrongFirstToken() throws IOException { |
|
1001 |
String code = "<"; |
|
1002 |
String expectedErrors = "Test.java:1:1: compiler.err.expected3: class, interface, enum\n" + |
|
1003 |
"1 error\n"; |
|
1004 |
StringWriter out = new StringWriter(); |
|
1005 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(out, fm, null, |
|
1006 |
Arrays.asList("-XDrawDiagnostics"), null, Arrays.asList(new MyFileObject(code))); |
|
1007 |
||
27992 | 1008 |
Result errorCode = ct.doCall(); |
1009 |
assertEquals("the error code is not correct; actual:" + errorCode, Main.Result.ERROR, errorCode); |
|
1010 |
String actualErrors = normalize(out.toString()); |
|
1011 |
assertEquals("the error message is not correct, actual: " + actualErrors, expectedErrors, actualErrors); |
|
27989 | 1012 |
} |
1013 |
||
50868 | 1014 |
@Test //JDK-8205913 |
1015 |
void testForInit() throws IOException { |
|
1016 |
String code = "class T { void t() { for (n : ns) { } } }"; |
|
1017 |
String expectedErrors = "Test.java:1:27: compiler.err.bad.initializer: for-loop\n"; |
|
1018 |
StringWriter out = new StringWriter(); |
|
1019 |
JavacTask ct = (JavacTask) tool.getTask(out, fm, null, |
|
1020 |
Arrays.asList("-XDrawDiagnostics"), null, Arrays.asList(new MyFileObject(code))); |
|
1021 |
||
1022 |
Iterable<? extends CompilationUnitTree> cuts = ct.parse(); |
|
1023 |
boolean[] foundVar = new boolean[1]; |
|
1024 |
||
1025 |
new TreePathScanner<Void, Void>() { |
|
1026 |
@Override public Void visitVariable(VariableTree vt, Void p) { |
|
1027 |
assertNotNull(vt.getModifiers()); |
|
1028 |
assertNotNull(vt.getType()); |
|
1029 |
assertNotNull(vt.getName()); |
|
1030 |
assertEquals("name should be <error>", "<error>", vt.getName().toString()); |
|
1031 |
foundVar[0] = true; |
|
1032 |
return super.visitVariable(vt, p); |
|
1033 |
} |
|
1034 |
}.scan(cuts, null); |
|
1035 |
||
1036 |
if (!foundVar[0]) { |
|
1037 |
fail("haven't found a variable"); |
|
1038 |
} |
|
1039 |
||
1040 |
String actualErrors = normalize(out.toString()); |
|
1041 |
assertEquals("the error message is not correct, actual: " + actualErrors, expectedErrors, actualErrors); |
|
1042 |
} |
|
1043 |
||
52622
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1044 |
@Test //JDK-821742 |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1045 |
void testCompDeclVarType() throws IOException { |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1046 |
String code = "package test; public class Test {" |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1047 |
+ "private void test() {" |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1048 |
+ "var v1 = 10,v2 = 12;" |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1049 |
+ "} private Test() {}}"; |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1050 |
|
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1051 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1052 |
null, null, Arrays.asList(new MyFileObject(code))); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1053 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1054 |
ct.enter(); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1055 |
ct.analyze(); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1056 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1057 |
MethodTree method = (MethodTree) clazz.getMembers().get(0); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1058 |
VariableTree stmt1 = (VariableTree) method.getBody().getStatements().get(0); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1059 |
VariableTree stmt2 = (VariableTree) method.getBody().getStatements().get(1); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1060 |
Tree v1Type = stmt1.getType(); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1061 |
Tree v2Type = stmt2.getType(); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1062 |
assertEquals("Implicit type for v1 is not correct: ", Kind.PRIMITIVE_TYPE, v1Type.getKind()); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1063 |
assertEquals("Implicit type for v2 is not correct: ", Kind.PRIMITIVE_TYPE, v2Type.getKind()); |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1064 |
} |
7a8af2f1f0c5
8210742: compound var declaration type is not uniform for all variables
sdama
parents:
51563
diff
changeset
|
1065 |
|
50898
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1066 |
@Test |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1067 |
void testCaseBodyStatements() throws IOException { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1068 |
String code = "class C {" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1069 |
" void t(int i) {" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1070 |
" switch (i) {" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1071 |
" case 0 -> i++;" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1072 |
" case 1 -> { i++; }" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1073 |
" case 2 -> throw new RuntimeException();" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1074 |
" case 3 -> if (true) ;" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1075 |
" default -> i++;" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1076 |
" }" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1077 |
" switch (i) {" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1078 |
" case 0: i++; break;" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1079 |
" case 1: { i++; break;}" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1080 |
" case 2: throw new RuntimeException();" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1081 |
" case 3: if (true) ; break;" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1082 |
" default: i++; break;" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1083 |
" }" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1084 |
" int j = switch (i) {" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1085 |
" case 0 -> i + 1;" + |
55306 | 1086 |
" case 1 -> { yield i + 1; }" + |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1087 |
" default -> throw new RuntimeException();" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1088 |
" };" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1089 |
" int k = switch (i) {" + |
55306 | 1090 |
" case 0: yield i + 1;" + |
1091 |
" case 1: { yield i + 1; }" + |
|
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1092 |
" default: throw new RuntimeException();" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1093 |
" };" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1094 |
" }" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1095 |
"}"; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1096 |
String expectedErrors = "Test.java:1:178: compiler.err.switch.case.unexpected.statement\n"; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1097 |
StringWriter out = new StringWriter(); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1098 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(out, fm, null, |
53878
4584d0331318
8219254: Update explicit uses of latest source/target in langtools tests to a property
darcy
parents:
53023
diff
changeset
|
1099 |
Arrays.asList("-XDrawDiagnostics", "--enable-preview", "-source", SOURCE_VERSION), |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1100 |
null, Arrays.asList(new MyFileObject(code))); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1101 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1102 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1103 |
Trees trees = Trees.instance(ct); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1104 |
List<String> spans = new ArrayList<>(); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1105 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1106 |
new TreePathScanner<Void, Void>() { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1107 |
@Override |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1108 |
public Void visitCase(CaseTree tree, Void v) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1109 |
if (tree.getBody() != null) { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1110 |
int start = (int) trees.getSourcePositions().getStartPosition(cut, tree.getBody()); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1111 |
int end = (int) trees.getSourcePositions().getEndPosition(cut, tree.getBody()); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1112 |
spans.add(code.substring(start, end)); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1113 |
} else { |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1114 |
spans.add("<null>"); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1115 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1116 |
return super.visitCase(tree, v); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1117 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1118 |
}.scan(cut, null); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1119 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1120 |
List<String> expectedSpans = List.of( |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1121 |
"i++;", "{ i++; }", "throw new RuntimeException();", "if (true) ;", "i++;", |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1122 |
"<null>", "<null>", "<null>", "<null>", "<null>", |
55306 | 1123 |
"i + 1"/*TODO semicolon?*/, "{ yield i + 1; }", "throw new RuntimeException();", |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1124 |
"<null>", "<null>", "<null>"); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1125 |
assertEquals("the error spans are not correct; actual:" + spans, expectedSpans, spans); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1126 |
String toString = normalize(cut.toString()); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1127 |
String expectedToString = |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1128 |
"\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1129 |
"class C {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1130 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1131 |
" void t(int i) {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1132 |
" switch (i) {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1133 |
" case 0 -> i++;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1134 |
" case 1 -> {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1135 |
" i++;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1136 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1137 |
" case 2 -> throw new RuntimeException();\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1138 |
" case 3 -> if (true) ;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1139 |
" default -> i++;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1140 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1141 |
" switch (i) {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1142 |
" case 0:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1143 |
" i++;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1144 |
" break;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1145 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1146 |
" case 1:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1147 |
" {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1148 |
" i++;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1149 |
" break;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1150 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1151 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1152 |
" case 2:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1153 |
" throw new RuntimeException();\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1154 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1155 |
" case 3:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1156 |
" if (true) ;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1157 |
" break;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1158 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1159 |
" default:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1160 |
" i++;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1161 |
" break;\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1162 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1163 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1164 |
" int j = switch (i) {\n" + |
55306 | 1165 |
" case 0 -> yield i + 1;\n" + |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1166 |
" case 1 -> {\n" + |
55306 | 1167 |
" yield i + 1;\n" + |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1168 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1169 |
" default -> throw new RuntimeException();\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1170 |
" };\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1171 |
" int k = switch (i) {\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1172 |
" case 0:\n" + |
55306 | 1173 |
" yield i + 1;\n" + |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1174 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1175 |
" case 1:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1176 |
" {\n" + |
55306 | 1177 |
" yield i + 1;\n" + |
51563
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1178 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1179 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1180 |
" default:\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1181 |
" throw new RuntimeException();\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1182 |
" \n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1183 |
" };\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1184 |
" }\n" + |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1185 |
"}"; |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1186 |
System.err.println("toString:"); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1187 |
System.err.println(toString); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1188 |
System.err.println("expectedToString:"); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1189 |
System.err.println(expectedToString); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1190 |
assertEquals("the error spans are not correct; actual:" + toString, expectedToString, toString); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1191 |
String actualErrors = normalize(out.toString()); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1192 |
assertEquals("the error message is not correct, actual: " + actualErrors, expectedErrors, actualErrors); |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1193 |
} |
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1194 |
|
de411d537aae
8206986: Compiler support for Switch Expressions (Preview)
jlahoda
parents:
50898
diff
changeset
|
1195 |
@Test |
50898
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1196 |
void testTypeParamsWithoutMethod() throws IOException { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1197 |
assert tool != null; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1198 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1199 |
String code = "package test; class Test { /**javadoc*/ |public <T> |}"; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1200 |
String[] parts = code.split("\\|"); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1201 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1202 |
code = parts[0] + parts[1] + parts[2]; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1203 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1204 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1205 |
null, Arrays.asList(new MyFileObject(code))); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1206 |
Trees trees = Trees.instance(ct); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1207 |
SourcePositions pos = trees.getSourcePositions(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1208 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1209 |
ClassTree clazz = (ClassTree) cut.getTypeDecls().get(0); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1210 |
ErroneousTree err = (ErroneousTree) clazz.getMembers().get(0); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1211 |
MethodTree method = (MethodTree) err.getErrorTrees().get(0); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1212 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1213 |
final int methodStart = parts[0].length(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1214 |
final int methodEnd = parts[0].length() + parts[1].length(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1215 |
assertEquals("testTypeParamsWithoutMethod", |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1216 |
methodStart, pos.getStartPosition(cut, method)); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1217 |
assertEquals("testTypeParamsWithoutMethod", |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1218 |
methodEnd, pos.getEndPosition(cut, method)); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1219 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1220 |
TreePath path2Method = new TreePath(new TreePath(new TreePath(cut), clazz), method); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1221 |
String javadoc = trees.getDocComment(path2Method); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1222 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1223 |
if (!"javadoc".equals(javadoc)) { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1224 |
throw new AssertionError("Expected javadoc not found, actual javadoc: " + javadoc); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1225 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1226 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1227 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1228 |
@Test |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1229 |
void testAnalyzeParensWithComma1() throws IOException { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1230 |
assert tool != null; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1231 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1232 |
String code = "package test; class Test { FI fi = |(s, |"; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1233 |
String[] parts = code.split("\\|", 3); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1234 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1235 |
code = parts[0] + parts[1] + parts[2]; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1236 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1237 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1238 |
null, Arrays.asList(new MyFileObject(code))); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1239 |
Trees trees = Trees.instance(ct); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1240 |
SourcePositions pos = trees.getSourcePositions(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1241 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1242 |
boolean[] found = new boolean[1]; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1243 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1244 |
new TreeScanner<Void, Void>() { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1245 |
@Override |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1246 |
public Void visitLambdaExpression(LambdaExpressionTree tree, Void v) { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1247 |
found[0] = true; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1248 |
int lambdaStart = parts[0].length(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1249 |
int lambdaEnd = parts[0].length() + parts[1].length(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1250 |
assertEquals("testAnalyzeParensWithComma1", |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1251 |
lambdaStart, pos.getStartPosition(cut, tree)); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1252 |
assertEquals("testAnalyzeParensWithComma1", |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1253 |
lambdaEnd, pos.getEndPosition(cut, tree)); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1254 |
return null; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1255 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1256 |
}.scan(cut, null); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1257 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1258 |
assertTrue("testAnalyzeParensWithComma1", found[0]); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1259 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1260 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1261 |
@Test |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1262 |
void testAnalyzeParensWithComma2() throws IOException { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1263 |
assert tool != null; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1264 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1265 |
String code = "package test; class Test { FI fi = |(s, o)|"; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1266 |
String[] parts = code.split("\\|", 3); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1267 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1268 |
code = parts[0] + parts[1] + parts[2]; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1269 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1270 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(null, fm, null, null, |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1271 |
null, Arrays.asList(new MyFileObject(code))); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1272 |
Trees trees = Trees.instance(ct); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1273 |
SourcePositions pos = trees.getSourcePositions(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1274 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1275 |
boolean[] found = new boolean[1]; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1276 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1277 |
new TreeScanner<Void, Void>() { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1278 |
@Override |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1279 |
public Void visitLambdaExpression(LambdaExpressionTree tree, Void v) { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1280 |
found[0] = true; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1281 |
int lambdaStart = parts[0].length(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1282 |
int lambdaEnd = parts[0].length() + parts[1].length(); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1283 |
assertEquals("testAnalyzeParensWithComma2", |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1284 |
lambdaStart, pos.getStartPosition(cut, tree)); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1285 |
assertEquals("testAnalyzeParensWithComma2", |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1286 |
lambdaEnd, pos.getEndPosition(cut, tree)); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1287 |
return null; |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1288 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1289 |
}.scan(cut, null); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1290 |
|
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1291 |
assertTrue("testAnalyzeParensWithComma2", found[0]); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1292 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1293 |
|
57724
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1294 |
@Test |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1295 |
void testBrokenEnum1() throws IOException { |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1296 |
assert tool != null; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1297 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1298 |
String code = "package test; class Test { enum E { A, B, C. D, E, F; } }"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1299 |
StringWriter output = new StringWriter(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1300 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(output, fm, null, List.of("-XDrawDiagnostics"), |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1301 |
null, Arrays.asList(new MyFileObject(code))); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1302 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1303 |
List<String> actual = List.of(output.toString().split("\r?\n")); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1304 |
List<String> expected = List.of("Test.java:1:44: compiler.err.expected3: ',', '}', ';'"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1305 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1306 |
assertEquals("The expected and actual errors do not match, actual errors: " + actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1307 |
actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1308 |
expected); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1309 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1310 |
String actualAST = cut.toString().replaceAll("\r*\n", "\n"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1311 |
String expectedAST = "package test;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1312 |
"\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1313 |
"class Test {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1314 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1315 |
" enum E {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1316 |
" /*public static final*/ A /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1317 |
" /*public static final*/ B /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1318 |
" /*public static final*/ C /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1319 |
" /*public static final*/ D /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1320 |
" /*public static final*/ E /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1321 |
" /*public static final*/ F /* = new E() */ /*enum*/ ;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1322 |
" (ERROR) <error>;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1323 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1324 |
"}"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1325 |
assertEquals("The expected and actual AST do not match, actual AST: " + actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1326 |
actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1327 |
expectedAST); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1328 |
} |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1329 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1330 |
@Test |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1331 |
void testBrokenEnum2() throws IOException { |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1332 |
assert tool != null; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1333 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1334 |
String code = "package test; class Test { enum E { A, B, C void t() {} } }"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1335 |
StringWriter output = new StringWriter(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1336 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(output, fm, null, List.of("-XDrawDiagnostics"), |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1337 |
null, Arrays.asList(new MyFileObject(code))); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1338 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1339 |
List<String> actual = List.of(output.toString().split("\r?\n")); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1340 |
List<String> expected = List.of("Test.java:1:44: compiler.err.expected3: ',', '}', ';'"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1341 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1342 |
assertEquals("The expected and actual errors do not match, actual errors: " + actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1343 |
actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1344 |
expected); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1345 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1346 |
String actualAST = cut.toString().replaceAll("\r*\n", "\n"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1347 |
String expectedAST = "package test;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1348 |
"\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1349 |
"class Test {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1350 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1351 |
" enum E {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1352 |
" /*public static final*/ A /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1353 |
" /*public static final*/ B /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1354 |
" /*public static final*/ C /* = new E() */ /*enum*/ ;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1355 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1356 |
" void t() {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1357 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1358 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1359 |
"}"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1360 |
assertEquals("The expected and actual AST do not match, actual AST: " + actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1361 |
actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1362 |
expectedAST); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1363 |
} |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1364 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1365 |
@Test |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1366 |
void testBrokenEnum3() throws IOException { |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1367 |
assert tool != null; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1368 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1369 |
String code = "package test; class Test { enum E { , void t() {} } }"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1370 |
StringWriter output = new StringWriter(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1371 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(output, fm, null, List.of("-XDrawDiagnostics"), |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1372 |
null, Arrays.asList(new MyFileObject(code))); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1373 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1374 |
List<String> actual = List.of(output.toString().split("\r?\n")); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1375 |
List<String> expected = List.of("Test.java:1:38: compiler.err.expected2: '}', ';'"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1376 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1377 |
assertEquals("The expected and actual errors do not match, actual errors: " + actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1378 |
actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1379 |
expected); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1380 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1381 |
String actualAST = cut.toString().replaceAll("\r*\n", "\n"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1382 |
String expectedAST = "package test;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1383 |
"\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1384 |
"class Test {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1385 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1386 |
" enum E {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1387 |
";\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1388 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1389 |
" void t() {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1390 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1391 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1392 |
"}"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1393 |
assertEquals("The expected and actual AST do not match, actual AST: " + actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1394 |
actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1395 |
expectedAST); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1396 |
} |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1397 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1398 |
@Test |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1399 |
void testBrokenEnum4() throws IOException { |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1400 |
assert tool != null; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1401 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1402 |
String code = "package test; class Test { enum E { A, B, C, void t() {} } }"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1403 |
StringWriter output = new StringWriter(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1404 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(output, fm, null, List.of("-XDrawDiagnostics"), |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1405 |
null, Arrays.asList(new MyFileObject(code))); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1406 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1407 |
List<String> actual = List.of(output.toString().split("\r?\n")); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1408 |
List<String> expected = List.of("Test.java:1:46: compiler.err.enum.constant.expected"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1409 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1410 |
assertEquals("The expected and actual errors do not match, actual errors: " + actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1411 |
actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1412 |
expected); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1413 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1414 |
String actualAST = cut.toString().replaceAll("\r*\n", "\n"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1415 |
String expectedAST = "package test;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1416 |
"\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1417 |
"class Test {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1418 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1419 |
" enum E {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1420 |
" /*public static final*/ A /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1421 |
" /*public static final*/ B /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1422 |
" /*public static final*/ C /* = new E() */ /*enum*/ ;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1423 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1424 |
" void t() {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1425 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1426 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1427 |
"}"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1428 |
assertEquals("The expected and actual AST do not match, actual AST: " + actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1429 |
actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1430 |
expectedAST); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1431 |
} |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1432 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1433 |
@Test |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1434 |
void testBrokenEnum5() throws IOException { |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1435 |
assert tool != null; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1436 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1437 |
String code = "package test; class Test { enum E { A; void t() {} B; } }"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1438 |
StringWriter output = new StringWriter(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1439 |
JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(output, fm, null, List.of("-XDrawDiagnostics"), |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1440 |
null, Arrays.asList(new MyFileObject(code))); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1441 |
CompilationUnitTree cut = ct.parse().iterator().next(); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1442 |
List<String> actual = List.of(output.toString().split("\r?\n")); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1443 |
List<String> expected = List.of("Test.java:1:52: compiler.err.enum.constant.not.expected"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1444 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1445 |
assertEquals("The expected and actual errors do not match, actual errors: " + actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1446 |
actual, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1447 |
expected); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1448 |
|
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1449 |
String actualAST = cut.toString().replaceAll("\r*\n", "\n"); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1450 |
String expectedAST = "package test;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1451 |
"\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1452 |
"class Test {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1453 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1454 |
" enum E {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1455 |
" /*public static final*/ A /* = new E() */ /*enum*/ ,\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1456 |
" /*public static final*/ B /* = new E() */ /*enum*/ ;\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1457 |
" \n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1458 |
" void t() {\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1459 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1460 |
" }\n" + |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1461 |
"}"; |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1462 |
assertEquals("The expected and actual AST do not match, actual AST: " + actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1463 |
actualAST, |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1464 |
expectedAST); |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1465 |
} |
447d48371b41
8228647: Broken enum produce inconvenient errors and AST
jlahoda
parents:
55306
diff
changeset
|
1466 |
|
13074 | 1467 |
void run(String[] args) throws Exception { |
1468 |
int passed = 0, failed = 0; |
|
1469 |
final Pattern p = (args != null && args.length > 0) |
|
1470 |
? Pattern.compile(args[0]) |
|
1471 |
: null; |
|
1472 |
for (Method m : this.getClass().getDeclaredMethods()) { |
|
1473 |
boolean selected = (p == null) |
|
1474 |
? m.isAnnotationPresent(Test.class) |
|
1475 |
: p.matcher(m.getName()).matches(); |
|
1476 |
if (selected) { |
|
1477 |
try { |
|
1478 |
m.invoke(this, (Object[]) null); |
|
1479 |
System.out.println(m.getName() + ": OK"); |
|
1480 |
passed++; |
|
1481 |
} catch (Throwable ex) { |
|
1482 |
System.out.printf("Test %s failed: %s %n", m, ex.getCause()); |
|
1483 |
failed++; |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1484 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1485 |
} |
13074 | 1486 |
} |
1487 |
System.out.printf("Passed: %d, Failed %d%n", passed, failed); |
|
1488 |
if (failed > 0) { |
|
1489 |
throw new RuntimeException("Tests failed: " + failed); |
|
1490 |
} |
|
1491 |
if (passed == 0 && failed == 0) { |
|
1492 |
throw new AssertionError("No test(s) selected: passed = " + |
|
1493 |
passed + ", failed = " + failed + " ??????????"); |
|
1494 |
} |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1495 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1496 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1497 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1498 |
abstract class TestCase { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1499 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1500 |
void assertEquals(String message, int i, int pos) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1501 |
if (i != pos) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1502 |
fail(message); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1503 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1504 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1505 |
|
12715
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
1506 |
void assertFalse(String message, boolean bvalue) { |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
1507 |
if (bvalue == true) { |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
1508 |
fail(message); |
139b8354de6a
7159445: (javac) emits inaccurate diagnostics for enhanced for-loops
ksrini
parents:
12466
diff
changeset
|
1509 |
} |
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1510 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1511 |
|
50898
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1512 |
void assertTrue(String message, boolean bvalue) { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1513 |
if (bvalue == false) { |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1514 |
fail(message); |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1515 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1516 |
} |
12133a6e2613
8205418: Assorted improvements to source code model
jlahoda
parents:
50868
diff
changeset
|
1517 |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1518 |
void assertEquals(String message, int i, long l) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1519 |
if (i != l) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1520 |
fail(message + ":" + i + ":" + l); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1521 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1522 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1523 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1524 |
void assertEquals(String message, Object o1, Object o2) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1525 |
if (o1 != null && o2 != null && !o1.equals(o2)) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1526 |
fail(message); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1527 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1528 |
if (o1 == null && o2 != null) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1529 |
fail(message); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1530 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1531 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1532 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1533 |
void assertNotNull(Object o) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1534 |
if (o == null) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1535 |
fail(); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1536 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1537 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1538 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1539 |
void fail() { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1540 |
fail("test failed"); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1541 |
} |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1542 |
|
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1543 |
void fail(String message) { |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1544 |
throw new RuntimeException(message); |
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1545 |
} |
13074 | 1546 |
|
1547 |
/** |
|
1548 |
* Indicates that the annotated method is a test method. |
|
1549 |
*/ |
|
1550 |
@Retention(RetentionPolicy.RUNTIME) |
|
1551 |
@Target(ElementType.METHOD) |
|
1552 |
public @interface Test {} |
|
11148
cb6d891ce911
7119487: JavacParserTest.java test fails on Windows platforms
ksrini
parents:
diff
changeset
|
1553 |
} |