author | erikj |
Tue, 12 Sep 2017 19:03:39 +0200 | |
changeset 47216 | 71c04702a3d5 |
parent 32454 | langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java@b0ac04e0fefe |
child 47350 | d65c3b21081c |
permissions | -rw-r--r-- |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
1 |
/* |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
15384
diff
changeset
|
2 |
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
4 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
8 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
13 |
* accompanied this code). |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
14 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
18 |
* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
21 |
* questions. |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
22 |
*/ |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
23 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
24 |
/* |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
25 |
* @test |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
26 |
* @bug 7046778 8006694 8129962 |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
27 |
* @summary Project Coin: problem with diamond and member inner classes |
15384
5a8d00abf076
8006694: temporarily workaround combo tests are causing time out in several platforms
vromero
parents:
15040
diff
changeset
|
28 |
* temporarily workaround combo tests are causing time out in several platforms |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
29 |
* @library /tools/javac/lib |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
30 |
* @modules jdk.compiler/com.sun.tools.javac.api |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.code |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
32 |
* jdk.compiler/com.sun.tools.javac.comp |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
33 |
* jdk.compiler/com.sun.tools.javac.main |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
34 |
* jdk.compiler/com.sun.tools.javac.tree |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
35 |
* jdk.compiler/com.sun.tools.javac.util |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
36 |
* @build combo.ComboTestHelper |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
37 |
* @compile -Xlint:all DiamondAndInnerClassTest.java |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
38 |
* @run main DiamondAndInnerClassTest |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
39 |
*/ |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
40 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
41 |
import java.io.IOException; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
42 |
import java.util.Arrays; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
43 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
44 |
import combo.ComboTestHelper; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
45 |
import combo.ComboInstance; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
46 |
import combo.ComboParameter; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
47 |
import combo.ComboTask.Result; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
48 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
49 |
public class DiamondAndInnerClassTest extends ComboInstance<DiamondAndInnerClassTest> { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
50 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
51 |
enum TypeArgumentKind implements ComboParameter { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
52 |
NONE(""), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
53 |
STRING("<String>"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
54 |
INTEGER("<Integer>"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
55 |
DIAMOND("<>"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
56 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
57 |
String typeargStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
58 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
59 |
TypeArgumentKind(String typeargStr) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
60 |
this.typeargStr = typeargStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
61 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
62 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
63 |
boolean compatible(TypeArgumentKind that) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
64 |
switch (this) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
65 |
case NONE: return true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
66 |
case STRING: return that != INTEGER; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
67 |
case INTEGER: return that != STRING; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
68 |
default: throw new AssertionError("Unexpected decl kind: " + this); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
69 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
70 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
71 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
72 |
boolean compatible(ArgumentKind that) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
73 |
switch (this) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
74 |
case NONE: return true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
75 |
case STRING: return that == ArgumentKind.STRING; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
76 |
case INTEGER: return that == ArgumentKind.INTEGER; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
77 |
default: throw new AssertionError("Unexpected decl kind: " + this); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
78 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
79 |
} |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
80 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
81 |
@Override |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
82 |
public String expand(String optParameter) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
83 |
return typeargStr; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
84 |
} |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
85 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
86 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
87 |
enum ArgumentKind implements ComboParameter { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
88 |
OBJECT("(Object)null"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
89 |
STRING("(String)null"), |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
90 |
INTEGER("(Integer)null"); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
91 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
92 |
String argStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
93 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
94 |
ArgumentKind(String argStr) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
95 |
this.argStr = argStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
96 |
} |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
97 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
98 |
@Override |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
99 |
public String expand(String optParameter) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
100 |
return argStr; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
101 |
} |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
102 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
103 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
104 |
enum TypeQualifierArity implements ComboParameter { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
105 |
ONE(1, "A1#{TA#IDX[0]}"), |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
106 |
TWO(2, "A1#{TA#IDX[0]}.A2#{TA#IDX[1]}"), |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
107 |
THREE(3, "A1#{TA#IDX[0]}.A2#{TA#IDX[1]}.A3#{TA#IDX[2]}"); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
108 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
109 |
int n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
110 |
String qualifierStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
111 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
112 |
TypeQualifierArity(int n, String qualifierStr) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
113 |
this.n = n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
114 |
this.qualifierStr = qualifierStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
115 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
116 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
117 |
@Override |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
118 |
public String expand(String optParameter) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
119 |
return qualifierStr.replaceAll("#IDX", optParameter); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
120 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
121 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
122 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
123 |
enum InnerClassDeclArity implements ComboParameter { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
124 |
ONE(1, "class A1<X> { A1(X x1) { } #{BODY} }"), |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
125 |
TWO(2, "class A1<X1> { class A2<X2> { A2(X1 x1, X2 x2) { } #{BODY} } }"), |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
126 |
THREE(3, "class A1<X1> { class A2<X2> { class A3<X3> { A3(X1 x1, X2 x2, X3 x3) { } #{BODY} } } }"); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
127 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
128 |
int n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
129 |
String classDeclStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
130 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
131 |
InnerClassDeclArity(int n, String classDeclStr) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
132 |
this.n = n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
133 |
this.classDeclStr = classDeclStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
134 |
} |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
135 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
136 |
@Override |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
137 |
public String expand(String optParameter) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
138 |
return classDeclStr; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
139 |
} |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
140 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
141 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
142 |
enum ArgumentListArity implements ComboParameter { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
143 |
ONE(1, "(#{A[0]})"), |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
144 |
TWO(2, "(#{A[0]},#{A[1]})"), |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
145 |
THREE(3, "(#{A[0]},#{A[1]},#{A[2]})"); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
146 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
147 |
int n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
148 |
String argListStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
149 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
150 |
ArgumentListArity(int n, String argListStr) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
151 |
this.n = n; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
152 |
this.argListStr = argListStr; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
153 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
154 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
155 |
@Override |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
156 |
public String expand(String optParameter) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
157 |
return argListStr.replaceAll("#IDX", optParameter); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
158 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
159 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
160 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
161 |
public static void main(String... args) throws Exception { |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
162 |
new ComboTestHelper<DiamondAndInnerClassTest>() |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
163 |
.withFilter(DiamondAndInnerClassTest::rareTypesFilter) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
164 |
.withFilter(DiamondAndInnerClassTest::noDiamondOnDecl) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
165 |
.withFilter(DiamondAndInnerClassTest::noDiamondOnIntermediateTypes) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
166 |
.withFilter(DiamondAndInnerClassTest::arityMismatch) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
167 |
.withFilter(DiamondAndInnerClassTest::redundantFilter) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
168 |
.withDimension("BODY", new ComboParameter.Constant<>("#{D.1} res = new #{S.2}#{AL};")) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
169 |
.withDimension("DECL", (x, arity) -> x.innerClassDeclArity = arity, InnerClassDeclArity.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
170 |
.withDimension("D", (x, arity) -> x.declArity = arity, TypeQualifierArity.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
171 |
.withDimension("S", (x, arity) -> x.siteArity = arity, TypeQualifierArity.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
172 |
.withDimension("AL", (x, alist) -> x.argumentListArity = alist, ArgumentListArity.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
173 |
.withArrayDimension("TA1", (x, targs, idx) -> x.declTypeArgumentKinds[idx] = targs, 3, TypeArgumentKind.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
174 |
.withArrayDimension("TA2", (x, targs, idx) -> x.siteTypeArgumentKinds[idx] = targs, 3, TypeArgumentKind.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
175 |
.withArrayDimension("A", (x, argsk, idx) -> x.argumentKinds[idx] = argsk, 3, ArgumentKind.values()) |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
176 |
.run(DiamondAndInnerClassTest::new); |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
177 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
178 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
179 |
InnerClassDeclArity innerClassDeclArity; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
180 |
TypeQualifierArity declArity; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
181 |
TypeQualifierArity siteArity; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
182 |
TypeArgumentKind[] declTypeArgumentKinds = new TypeArgumentKind[3]; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
183 |
TypeArgumentKind[] siteTypeArgumentKinds = new TypeArgumentKind[3]; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
184 |
ArgumentKind[] argumentKinds = new ArgumentKind[3]; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
185 |
ArgumentListArity argumentListArity; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
186 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
187 |
boolean rareTypesFilter() { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
188 |
for (TypeArgumentKind[] types : Arrays.asList(declTypeArgumentKinds, siteTypeArgumentKinds)) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
189 |
boolean isRaw = types[0] == TypeArgumentKind.NONE; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
190 |
for (int i = 1; i < innerClassDeclArity.n; i++) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
191 |
if (isRaw != (types[i] == TypeArgumentKind.NONE)) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
192 |
return false; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
193 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
194 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
195 |
} |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
196 |
return true; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
197 |
} |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
198 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
199 |
boolean noDiamondOnDecl() { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
200 |
for (int i = 0; i < innerClassDeclArity.n; i++) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
201 |
if (declTypeArgumentKinds[i] == TypeArgumentKind.DIAMOND) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
202 |
return false; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
203 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
204 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
205 |
return true; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
206 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
207 |
|
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
208 |
boolean noDiamondOnIntermediateTypes() { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
209 |
for (int i = 0; i < (innerClassDeclArity.n - 1); i++) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
210 |
if (siteTypeArgumentKinds[i] == TypeArgumentKind.DIAMOND) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
211 |
return false; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
212 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
213 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
214 |
return true; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
215 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
216 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
217 |
boolean redundantFilter() { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
218 |
for (TypeArgumentKind[] types : Arrays.asList(declTypeArgumentKinds, siteTypeArgumentKinds)) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
219 |
for (int i = innerClassDeclArity.n; i < types.length; i++) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
220 |
if (types[i].ordinal() != 0) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
221 |
return false; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
222 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
223 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
224 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
225 |
for (int i = innerClassDeclArity.n; i < argumentKinds.length; i++) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
226 |
if (argumentKinds[i].ordinal() != 0) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
227 |
return false; |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
228 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
229 |
} |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
230 |
return true; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
231 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
232 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
233 |
boolean arityMismatch() { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
234 |
return argumentListArity.n == innerClassDeclArity.n && |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
235 |
siteArity.n == innerClassDeclArity.n && |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
236 |
declArity.n == innerClassDeclArity.n; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
237 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
238 |
|
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
239 |
@Override |
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
240 |
public void doWork() throws IOException { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
241 |
check(newCompilationTask() |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
242 |
.withSourceFromTemplate("#{DECL}") |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
243 |
.analyze()); |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
244 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
245 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
246 |
void check(Result<?> res) { |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
247 |
boolean errorExpected = false; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
248 |
|
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
249 |
TypeArgumentKind[] expectedArgKinds = |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
250 |
new TypeArgumentKind[innerClassDeclArity.n]; |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
251 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
252 |
for (int i = 0 ; i < innerClassDeclArity.n ; i++) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
253 |
if (!declTypeArgumentKinds[i].compatible(siteTypeArgumentKinds[i])) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
254 |
errorExpected = true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
255 |
break; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
256 |
} |
15040
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
257 |
expectedArgKinds[i] = siteTypeArgumentKinds[i] == |
99fd9483d3f0
8005167: execution time of combo tests in javac should be improved
vromero
parents:
11381
diff
changeset
|
258 |
TypeArgumentKind.DIAMOND ? |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
259 |
declTypeArgumentKinds[i] : siteTypeArgumentKinds[i]; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
260 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
261 |
|
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
262 |
if (!errorExpected) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
263 |
for (int i = 0 ; i < innerClassDeclArity.n ; i++) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
264 |
if (!expectedArgKinds[i].compatible(argumentKinds[i])) { |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
265 |
errorExpected = true; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
266 |
break; |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
267 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
268 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
269 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
270 |
|
32454
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
271 |
if (errorExpected != res.hasErrors()) { |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
272 |
fail("invalid diagnostics for source:\n" + |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
273 |
res.compilationInfo() + |
b0ac04e0fefe
8129962: Investigate performance improvements in langtools combo tests
mcimadamore
parents:
30730
diff
changeset
|
274 |
"\nFound error: " + res.hasErrors() + |
10198
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
275 |
"\nExpected error: " + errorExpected); |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
276 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
277 |
} |
84698d93792c
7046778: Project Coin: problem with diamond and member inner classes
mcimadamore
parents:
diff
changeset
|
278 |
} |