|
33362
|
1 |
/*
|
|
36499
|
2 |
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
|
33362
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
4 |
*
|
|
|
5 |
* This code is free software; you can redistribute it and/or modify it
|
|
|
6 |
* under the terms of the GNU General Public License version 2 only, as
|
|
|
7 |
* published by the Free Software Foundation.
|
|
|
8 |
*
|
|
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that
|
|
|
13 |
* accompanied this code).
|
|
|
14 |
*
|
|
|
15 |
* You should have received a copy of the GNU General Public License version
|
|
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
18 |
*
|
|
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
20 |
* or visit www.oracle.com if you need additional information or have any
|
|
|
21 |
* questions.
|
|
|
22 |
*/
|
|
|
23 |
|
|
|
24 |
/*
|
|
36499
|
25 |
* @test 8080069
|
|
33362
|
26 |
* @summary Test of Snippet redefinition and replacement.
|
|
|
27 |
* @build KullaTesting TestingInputStream
|
|
|
28 |
* @run testng ReplaceTest
|
|
|
29 |
*/
|
|
|
30 |
|
|
|
31 |
import java.util.Collection;
|
|
|
32 |
|
|
36499
|
33 |
import java.util.List;
|
|
33362
|
34 |
import jdk.jshell.Snippet;
|
|
|
35 |
import jdk.jshell.MethodSnippet;
|
|
|
36 |
import jdk.jshell.PersistentSnippet;
|
|
|
37 |
import jdk.jshell.TypeDeclSnippet;
|
|
|
38 |
import jdk.jshell.VarSnippet;
|
|
|
39 |
import jdk.jshell.DeclarationSnippet;
|
|
|
40 |
import org.testng.annotations.Test;
|
|
|
41 |
|
|
36499
|
42 |
import jdk.jshell.SnippetEvent;
|
|
|
43 |
import jdk.jshell.UnresolvedReferenceException;
|
|
|
44 |
import static org.testng.Assert.assertEquals;
|
|
33362
|
45 |
import static jdk.jshell.Snippet.Status.*;
|
|
|
46 |
import static jdk.jshell.Snippet.SubKind.*;
|
|
|
47 |
import static org.testng.Assert.assertTrue;
|
|
|
48 |
|
|
|
49 |
@Test
|
|
|
50 |
public class ReplaceTest extends KullaTesting {
|
|
|
51 |
|
|
|
52 |
public void testRedefine() {
|
|
|
53 |
Snippet vx = varKey(assertEval("int x;"));
|
|
|
54 |
Snippet mu = methodKey(assertEval("int mu() { return x * 4; }"));
|
|
|
55 |
Snippet c = classKey(assertEval("class C { String v() { return \"#\" + mu(); } }"));
|
|
|
56 |
assertEval("C c0 = new C();");
|
|
|
57 |
assertEval("c0.v();", "\"#0\"");
|
|
|
58 |
assertEval("int x = 10;", "10",
|
|
|
59 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
60 |
ste(vx, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
61 |
assertEval("c0.v();", "\"#40\"");
|
|
|
62 |
assertEval("C c = new C();");
|
|
|
63 |
assertEval("c.v();", "\"#40\"");
|
|
|
64 |
assertEval("int mu() { return x * 3; }",
|
|
|
65 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
66 |
ste(mu, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
67 |
assertEval("c.v();", "\"#30\"");
|
|
|
68 |
assertEval("class C { String v() { return \"@\" + mu(); } }",
|
|
|
69 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
70 |
ste(c, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
71 |
assertEval("c0.v();", "\"@30\"");
|
|
|
72 |
assertEval("c = new C();");
|
|
|
73 |
assertEval("c.v();", "\"@30\"");
|
|
|
74 |
assertActiveKeys();
|
|
|
75 |
}
|
|
|
76 |
|
|
|
77 |
public void testReplaceClassToVar() {
|
|
|
78 |
Snippet oldA = classKey(assertEval("class A { public String toString() { return \"old\"; } }"));
|
|
|
79 |
Snippet v = varKey(assertEval("A a = new A();", "old"));
|
|
|
80 |
assertEval("a;", "old");
|
|
|
81 |
Snippet midA = classKey(assertEval("class A { public String toString() { return \"middle\"; } }",
|
|
|
82 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
83 |
ste(oldA, VALID, OVERWRITTEN, false, MAIN_SNIPPET)));
|
|
|
84 |
assertEval("a;", "middle");
|
|
|
85 |
assertEval("class A { int x; public String toString() { return \"new\"; } }",
|
|
|
86 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
87 |
ste(midA, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
88 |
ste(v, VALID, VALID, true, MAIN_SNIPPET));
|
|
|
89 |
assertEval("a;", "null");
|
|
|
90 |
assertActiveKeys();
|
|
|
91 |
}
|
|
|
92 |
|
|
|
93 |
public void testReplaceVarToMethod() {
|
|
|
94 |
Snippet x = varKey(assertEval("int x;"));
|
|
|
95 |
Snippet musn = methodKey(assertEval("double mu() { return x * 4; }"));
|
|
|
96 |
assertEval("x == 0;", "true");
|
|
|
97 |
assertEval("mu() == 0.0;", "true");
|
|
|
98 |
assertEval("double x = 2.5;",
|
|
|
99 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
100 |
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
101 |
ste(musn, VALID, VALID, false, MAIN_SNIPPET));
|
|
|
102 |
Collection<MethodSnippet> meths = getState().methods();
|
|
|
103 |
assertEquals(meths.size(), 1);
|
|
|
104 |
assertTrue(musn == meths.iterator().next(), "Identity must not change");
|
|
|
105 |
assertEval("x == 2.5;", "true");
|
|
|
106 |
assertEval("mu() == 10.0;", "true"); // Auto redefine
|
|
|
107 |
assertActiveKeys();
|
|
|
108 |
}
|
|
|
109 |
|
|
|
110 |
public void testReplaceMethodToMethod() {
|
|
|
111 |
Snippet a = methodKey(assertEval("double a() { return 2; }"));
|
|
|
112 |
Snippet b = methodKey(assertEval("double b() { return a() * 10; }"));
|
|
|
113 |
assertEval("double c() { return b() * 3; }");
|
|
|
114 |
assertEval("double d() { return c() + 1000; }");
|
|
|
115 |
assertEval("d();", "1060.0");
|
|
|
116 |
assertEval("int a() { return 5; }",
|
|
|
117 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
118 |
ste(a, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
119 |
ste(b, VALID, VALID, false, MAIN_SNIPPET));
|
|
|
120 |
assertEval("d();", "1150.0");
|
|
|
121 |
assertActiveKeys();
|
|
|
122 |
}
|
|
|
123 |
|
|
|
124 |
public void testReplaceClassToMethod() {
|
|
|
125 |
Snippet c = classKey(assertEval("class C { int f() { return 7; } }"));
|
|
|
126 |
Snippet m = methodKey(assertEval("int m() { return new C().f(); }"));
|
|
|
127 |
assertEval("m();", "7");
|
|
|
128 |
assertEval("class C { int x = 99; int f() { return x; } }",
|
|
|
129 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
130 |
ste(c, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
131 |
ste(m, VALID, VALID, false, MAIN_SNIPPET));
|
|
|
132 |
assertEval("m();", "99");
|
|
|
133 |
assertActiveKeys();
|
|
|
134 |
}
|
|
|
135 |
|
|
|
136 |
public void testReplaceVarToClass() {
|
|
|
137 |
Snippet x = varKey(assertEval("int x;"));
|
|
|
138 |
Snippet c = classKey(assertEval("class A { double a = 4 * x; }"));
|
|
|
139 |
assertEval("x == 0;", "true");
|
|
|
140 |
assertEval("new A().a == 0.0;", "true");
|
|
|
141 |
assertEval("double x = 2.5;",
|
|
|
142 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
143 |
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
144 |
ste(c, VALID, VALID, false, MAIN_SNIPPET));
|
|
|
145 |
Collection<TypeDeclSnippet> classes = getState().types();
|
|
|
146 |
assertEquals(classes.size(), 1);
|
|
|
147 |
assertTrue(c == classes.iterator().next(), "Identity must not change");
|
|
|
148 |
assertEval("x == 2.5;", "true");
|
|
|
149 |
assertEval("new A().a == 10.0;", "true");
|
|
|
150 |
assertActiveKeys();
|
|
|
151 |
}
|
|
|
152 |
|
|
|
153 |
public void testReplaceMethodToClass() {
|
|
|
154 |
Snippet x = methodKey(assertEval("int x() { return 0; }"));
|
|
|
155 |
Snippet c = classKey(assertEval("class A { double a = 4 * x(); }"));
|
|
|
156 |
assertEval("x() == 0;", "true");
|
|
|
157 |
assertEval("new A().a == 0.0;", "true");
|
|
|
158 |
assertEval("double x() { return 2.5; }",
|
|
|
159 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
160 |
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
161 |
ste(c, VALID, VALID, false, MAIN_SNIPPET));
|
|
|
162 |
assertEval("x();", "2.5");
|
|
|
163 |
Collection<TypeDeclSnippet> classes = getState().types();
|
|
|
164 |
assertEquals(classes.size(), 1);
|
|
|
165 |
assertTrue(c == classes.iterator().next(), "Identity must not change");
|
|
|
166 |
assertEval("x() == 2.5;", "true");
|
|
|
167 |
assertEval("new A().a == 10.0;", "true");
|
|
|
168 |
assertActiveKeys();
|
|
|
169 |
}
|
|
|
170 |
|
|
|
171 |
public void testReplaceClassToClass() {
|
|
|
172 |
TypeDeclSnippet a = classKey(assertEval("class A {}"));
|
|
|
173 |
assertTypeDeclSnippet(a, "A", VALID, CLASS_SUBKIND, 0, 0);
|
|
|
174 |
TypeDeclSnippet b = classKey(assertEval("class B extends A {}"));
|
|
|
175 |
TypeDeclSnippet c = classKey(assertEval("class C extends B {}"));
|
|
|
176 |
TypeDeclSnippet d = classKey(assertEval("class D extends C {}"));
|
|
|
177 |
assertEval("class A { int x; public String toString() { return \"NEW\"; } }",
|
|
|
178 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
179 |
ste(a, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
180 |
ste(b, VALID, VALID, true, MAIN_SNIPPET),
|
|
|
181 |
ste(c, VALID, VALID, true, b),
|
|
|
182 |
ste(d, VALID, VALID, true, c));
|
|
|
183 |
assertTypeDeclSnippet(b, "B", VALID, CLASS_SUBKIND, 0, 0);
|
|
|
184 |
assertTypeDeclSnippet(c, "C", VALID, CLASS_SUBKIND, 0, 0);
|
|
|
185 |
assertTypeDeclSnippet(d, "D", VALID, CLASS_SUBKIND, 0, 0);
|
|
|
186 |
assertEval("new D();", "NEW");
|
|
|
187 |
assertActiveKeys();
|
|
|
188 |
}
|
|
|
189 |
|
|
|
190 |
public void testOverwriteReplaceMethod() {
|
|
|
191 |
MethodSnippet k1 = methodKey(assertEval("String m(Integer i) { return i.toString(); }"));
|
|
|
192 |
MethodSnippet k2 = methodKey(assertEval("String m(java.lang.Integer i) { return \"java.lang.\" + i.toString(); }",
|
|
|
193 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
194 |
ste(k1, VALID, OVERWRITTEN, false, MAIN_SNIPPET)));
|
|
|
195 |
assertMethodDeclSnippet(k1, "m", "(Integer)String", OVERWRITTEN, 0, 0);
|
|
|
196 |
assertEval("m(6);", "\"java.lang.6\"");
|
|
|
197 |
assertEval("String m(Integer i) { return i.toString(); }",
|
|
|
198 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
199 |
ste(k2, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
200 |
assertMethodDeclSnippet(k2, "m", "(java.lang.Integer)String", OVERWRITTEN, 0, 0);
|
|
|
201 |
assertEval("m(6);", "\"6\"");
|
|
|
202 |
assertActiveKeys();
|
|
|
203 |
}
|
|
|
204 |
|
|
|
205 |
public void testOverwriteMethodForwardReferenceClass() {
|
|
|
206 |
Snippet k1 = methodKey(assertEval("int q(Boo b) { return b.x; }",
|
|
|
207 |
added(RECOVERABLE_NOT_DEFINED)));
|
|
|
208 |
assertUnresolvedDependencies1((MethodSnippet) k1, RECOVERABLE_NOT_DEFINED, "class Boo");
|
|
|
209 |
assertEval("class Boo { int x = 55; }",
|
|
|
210 |
added(VALID),
|
|
|
211 |
ste(k1, RECOVERABLE_NOT_DEFINED, VALID, true, null));
|
|
|
212 |
assertMethodDeclSnippet((MethodSnippet) k1, "q", "(Boo)int", VALID, 0, 0);
|
|
|
213 |
assertEval("q(new Boo());", "55");
|
|
|
214 |
assertActiveKeys();
|
|
|
215 |
}
|
|
|
216 |
|
|
|
217 |
public void testOverwriteMethodForwardReferenceClassImport() {
|
|
|
218 |
MethodSnippet k1 = methodKey(assertEval("int ff(List lis) { return lis.size(); }",
|
|
|
219 |
added(RECOVERABLE_NOT_DEFINED)));
|
|
|
220 |
assertUnresolvedDependencies1(k1, RECOVERABLE_NOT_DEFINED, "class List");
|
|
|
221 |
assertEval("import java.util.*;",
|
|
|
222 |
added(VALID),
|
|
|
223 |
ste(k1, RECOVERABLE_NOT_DEFINED, VALID, true, null));
|
|
|
224 |
assertMethodDeclSnippet(k1, "ff", "(List)int", VALID, 0, 0);
|
|
|
225 |
assertEval("ff(new ArrayList());", "0");
|
|
|
226 |
assertActiveKeys();
|
|
|
227 |
}
|
|
|
228 |
|
|
|
229 |
public void testForwardVarToMethod() {
|
|
|
230 |
DeclarationSnippet t = methodKey(assertEval("int t() { return x; }", added(RECOVERABLE_DEFINED)));
|
|
|
231 |
assertUnresolvedDependencies1(t, RECOVERABLE_DEFINED, "variable x");
|
|
|
232 |
assertEvalUnresolvedException("t();", "t", 1, 0);
|
|
|
233 |
Snippet x = varKey(assertEval("int x = 33;", "33",
|
|
|
234 |
added(VALID),
|
|
|
235 |
ste(t, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
|
236 |
assertEval("t();", "33");
|
|
|
237 |
assertEval("double x = 0.88;",
|
|
|
238 |
"0.88", null,
|
|
|
239 |
DiagCheck.DIAG_OK,
|
|
|
240 |
DiagCheck.DIAG_ERROR,
|
|
|
241 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
242 |
ste(x, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
243 |
ste(t, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET));
|
|
|
244 |
assertEvalUnresolvedException("t();", "t", 0, 1);
|
|
|
245 |
assertActiveKeys();
|
|
|
246 |
}
|
|
|
247 |
|
|
|
248 |
public void testForwardMethodToMethod() {
|
|
|
249 |
Snippet t = methodKey(assertEval("int t() { return f(); }", added(RECOVERABLE_DEFINED)));
|
|
|
250 |
Snippet f = methodKey(assertEval("int f() { return g(); }",
|
|
|
251 |
added(RECOVERABLE_DEFINED),
|
|
|
252 |
ste(t, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
|
253 |
assertUnresolvedDependencies1((DeclarationSnippet) f, RECOVERABLE_DEFINED, "method g()");
|
|
|
254 |
assertEvalUnresolvedException("t();", "f", 1, 0);
|
|
|
255 |
Snippet g = methodKey(assertEval("int g() { return 55; }",
|
|
|
256 |
added(VALID),
|
|
|
257 |
ste(f, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
|
258 |
assertEval("t();", "55");
|
|
|
259 |
assertEval("double g() { return 3.14159; }",
|
|
|
260 |
DiagCheck.DIAG_OK,
|
|
|
261 |
DiagCheck.DIAG_ERROR,
|
|
|
262 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
263 |
ste(g, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
264 |
ste(f, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET));
|
|
36499
|
265 |
DeclarationSnippet exsn = assertEvalUnresolvedException("t();", "f", 0, 1);
|
|
33362
|
266 |
assertTrue(exsn == f, "Identity must not change");
|
|
|
267 |
assertActiveKeys();
|
|
|
268 |
}
|
|
|
269 |
|
|
|
270 |
public void testForwardClassToMethod() {
|
|
|
271 |
DeclarationSnippet t = methodKey(assertEval("int t() { return new A().f(); }", added(RECOVERABLE_DEFINED)));
|
|
|
272 |
assertUnresolvedDependencies1(t, RECOVERABLE_DEFINED, "class A");
|
|
|
273 |
assertEvalUnresolvedException("t();", "t", 1, 0);
|
|
|
274 |
Snippet a = classKey(assertEval(
|
|
|
275 |
"class A {\n" +
|
|
|
276 |
" int f() { return 10; }\n" +
|
|
|
277 |
"}",
|
|
|
278 |
added(VALID),
|
|
|
279 |
ste(t, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
|
280 |
assertEval("t();", "10");
|
|
|
281 |
assertEval(
|
|
|
282 |
"class A {\n" +
|
|
|
283 |
" double f() { return 88.0; }\n" +
|
|
|
284 |
"}",
|
|
|
285 |
DiagCheck.DIAG_OK,
|
|
|
286 |
DiagCheck.DIAG_ERROR,
|
|
|
287 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
288 |
ste(a, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
289 |
ste(t, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET));
|
|
|
290 |
assertEvalUnresolvedException("t();", "t", 0, 1);
|
|
|
291 |
assertActiveKeys();
|
|
|
292 |
}
|
|
|
293 |
|
|
|
294 |
public void testForwardVarToClass() {
|
|
36499
|
295 |
DeclarationSnippet a = classKey(assertEval("class A { int f() { return g; } }", added(RECOVERABLE_DEFINED)));
|
|
|
296 |
assertUnresolvedDependencies1(a, RECOVERABLE_DEFINED, "variable g");
|
|
|
297 |
Snippet g = varKey(assertEval("int g = 10;", "10",
|
|
|
298 |
added(VALID),
|
|
|
299 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
|
300 |
assertEval("new A().f();", "10");
|
|
|
301 |
assertEval("double g = 10;", "10.0", null,
|
|
|
302 |
DiagCheck.DIAG_OK,
|
|
|
303 |
DiagCheck.DIAG_ERROR,
|
|
|
304 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
305 |
ste(g, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
306 |
ste(a, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET));
|
|
|
307 |
assertUnresolvedDependencies(a, 0);
|
|
|
308 |
assertActiveKeys();
|
|
|
309 |
}
|
|
|
310 |
|
|
|
311 |
public void testForwardVarToClassGeneric() {
|
|
|
312 |
DeclarationSnippet a = classKey(assertEval("class A<T> { final T x; A(T v) { this.x = v; } ; T get() { return x; } int core() { return g; } }", added(RECOVERABLE_DEFINED)));
|
|
|
313 |
assertUnresolvedDependencies1(a, RECOVERABLE_DEFINED, "variable g");
|
|
|
314 |
|
|
|
315 |
List<SnippetEvent> events = assertEval("A<String> as = new A<>(\"hi\");", null,
|
|
|
316 |
UnresolvedReferenceException.class, DiagCheck.DIAG_OK, DiagCheck.DIAG_OK, null);
|
|
|
317 |
SnippetEvent ste = events.get(0);
|
|
|
318 |
Snippet assn = ste.snippet();
|
|
|
319 |
DeclarationSnippet unsn = ((UnresolvedReferenceException) ste.exception()).getSnippet();
|
|
|
320 |
assertEquals(unsn.name(), "A", "Wrong with unresolved");
|
|
|
321 |
assertEquals(getState().unresolvedDependencies(unsn).size(), 1, "Wrong size unresolved");
|
|
|
322 |
assertEquals(getState().diagnostics(unsn).size(), 0, "Expected no diagnostics");
|
|
|
323 |
|
|
33362
|
324 |
Snippet g = varKey(assertEval("int g = 10;", "10",
|
|
|
325 |
added(VALID),
|
|
36499
|
326 |
ste(a, RECOVERABLE_DEFINED, VALID, false, MAIN_SNIPPET)));
|
|
|
327 |
assertEval("A<String> as = new A<>(\"low\");",
|
|
|
328 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
329 |
ste(assn, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
330 |
assertEval("as.get();", "\"low\"");
|
|
|
331 |
assertUnresolvedDependencies(a, 0);
|
|
|
332 |
assertActiveKeys();
|
|
|
333 |
}
|
|
|
334 |
|
|
|
335 |
public void testForwardVarToClassExtendsImplements() {
|
|
|
336 |
DeclarationSnippet ik = classKey(assertEval("interface I { default int ii() { return 1; } }", added(VALID)));
|
|
|
337 |
DeclarationSnippet jk = classKey(assertEval("interface J { default int jj() { return 2; } }", added(VALID)));
|
|
|
338 |
DeclarationSnippet ck = classKey(assertEval("class C { int cc() { return 3; } }", added(VALID)));
|
|
|
339 |
DeclarationSnippet dk = classKey(assertEval("class D extends C implements I,J { int dd() { return g; } }", added(RECOVERABLE_DEFINED)));
|
|
|
340 |
DeclarationSnippet ek = classKey(assertEval("class E extends D { int ee() { return 5; } }", added(VALID)));
|
|
|
341 |
assertUnresolvedDependencies1(dk, RECOVERABLE_DEFINED, "variable g");
|
|
|
342 |
assertEvalUnresolvedException("new D();", "D", 1, 0);
|
|
|
343 |
assertEvalUnresolvedException("new E();", "D", 1, 0);
|
|
|
344 |
VarSnippet g = varKey(assertEval("int g = 10;", "10",
|
|
|
345 |
added(VALID),
|
|
|
346 |
ste(dk, RECOVERABLE_DEFINED, VALID, false, MAIN_SNIPPET)));
|
|
|
347 |
assertEval("E e = new E();");
|
|
|
348 |
assertDrop(g,
|
|
|
349 |
ste(g, VALID, DROPPED, true, null),
|
|
|
350 |
ste(dk, VALID, RECOVERABLE_DEFINED, false, g));
|
|
|
351 |
assertEvalUnresolvedException("new D();", "D", 1, 0);
|
|
|
352 |
assertEvalUnresolvedException("new E();", "D", 1, 0);
|
|
|
353 |
assertEval("e.ee();", "5");
|
|
|
354 |
assertEvalUnresolvedException("e.dd();", "D", 1, 0);
|
|
|
355 |
assertEval("e.cc();", "3");
|
|
|
356 |
assertEval("e.jj();", "2");
|
|
|
357 |
assertEval("e.ii();", "1");
|
|
|
358 |
assertActiveKeys();
|
|
|
359 |
}
|
|
|
360 |
|
|
|
361 |
public void testForwardVarToInterface() {
|
|
|
362 |
DeclarationSnippet i = classKey(assertEval("interface I { default int f() { return x; } }", added(RECOVERABLE_DEFINED)));
|
|
|
363 |
assertUnresolvedDependencies1(i, RECOVERABLE_DEFINED, "variable x");
|
|
|
364 |
DeclarationSnippet c = classKey(assertEval("class C implements I { int z() { return 2; } }", added(VALID)));
|
|
|
365 |
assertEval("C c = new C();");
|
|
|
366 |
assertEval("c.z();", "2");
|
|
|
367 |
assertEvalUnresolvedException("c.f()", "I", 1, 0);
|
|
|
368 |
Snippet g = varKey(assertEval("int x = 55;", "55",
|
|
|
369 |
added(VALID),
|
|
|
370 |
ste(i, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
|
371 |
assertEval("c.f();", "55");
|
|
|
372 |
assertUnresolvedDependencies(i, 0);
|
|
|
373 |
assertActiveKeys();
|
|
|
374 |
}
|
|
|
375 |
|
|
|
376 |
public void testForwardVarToEnum() {
|
|
|
377 |
DeclarationSnippet a = classKey(assertEval("enum E { Q, W, E; float ff() { return fff; } }", added(RECOVERABLE_NOT_DEFINED)));
|
|
|
378 |
assertUnresolvedDependencies1(a, RECOVERABLE_NOT_DEFINED, "variable fff");
|
|
|
379 |
Snippet g = varKey(assertEval("float fff = 4.5f;", "4.5",
|
|
|
380 |
added(VALID),
|
|
33362
|
381 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, null)));
|
|
36499
|
382 |
assertEval("E.Q.ff();", "4.5");
|
|
|
383 |
assertEval("double fff = 3.3;", "3.3", null,
|
|
33362
|
384 |
DiagCheck.DIAG_OK,
|
|
|
385 |
DiagCheck.DIAG_ERROR,
|
|
|
386 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
387 |
ste(g, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
388 |
ste(a, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET));
|
|
|
389 |
assertUnresolvedDependencies(a, 0);
|
|
|
390 |
assertActiveKeys();
|
|
|
391 |
}
|
|
|
392 |
|
|
|
393 |
public void testForwardMethodToClass() {
|
|
36499
|
394 |
DeclarationSnippet a = classKey(assertEval("class A { int f() { return g(); } }", added(RECOVERABLE_DEFINED)));
|
|
|
395 |
assertUnresolvedDependencies1(a, RECOVERABLE_DEFINED, "method g()");
|
|
|
396 |
assertEval("A foo() { return null; }");
|
|
|
397 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
398 |
Snippet g = methodKey(assertEval("int g() { return 10; }",
|
|
|
399 |
added(VALID),
|
|
36499
|
400 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null)));
|
|
33362
|
401 |
assertEval("new A().f();", "10");
|
|
|
402 |
assertEval("double g() { return 10; }",
|
|
|
403 |
DiagCheck.DIAG_OK,
|
|
|
404 |
DiagCheck.DIAG_ERROR,
|
|
|
405 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
406 |
ste(g, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
36499
|
407 |
ste(a, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET));
|
|
33362
|
408 |
assertUnresolvedDependencies(a, 0);
|
|
|
409 |
assertActiveKeys();
|
|
|
410 |
}
|
|
|
411 |
|
|
|
412 |
public void testForwardClassToClass1() {
|
|
|
413 |
Snippet a = classKey(assertEval("class A { B b = new B(); }", added(RECOVERABLE_NOT_DEFINED)));
|
|
|
414 |
assertDeclareFail("new A().b;", "compiler.err.cant.resolve.location");
|
|
|
415 |
|
|
|
416 |
Snippet b = classKey(assertEval("class B { public String toString() { return \"B\"; } }",
|
|
|
417 |
added(VALID),
|
|
|
418 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, null)));
|
|
|
419 |
assertEval("new A().b;", "B");
|
|
|
420 |
assertEval("interface B { }",
|
|
|
421 |
DiagCheck.DIAG_OK,
|
|
|
422 |
DiagCheck.DIAG_ERROR,
|
|
|
423 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
424 |
ste(b, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
36499
|
425 |
ste(a, VALID, RECOVERABLE_DEFINED, true, MAIN_SNIPPET));
|
|
|
426 |
assertEvalUnresolvedException("new A().b;", "A", 0, 1);
|
|
33362
|
427 |
assertActiveKeys();
|
|
|
428 |
}
|
|
|
429 |
|
|
|
430 |
public void testForwardClassToClass2() {
|
|
|
431 |
Snippet a = classKey(assertEval("class A extends B { }", added(RECOVERABLE_NOT_DEFINED)));
|
|
|
432 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
433 |
|
|
|
434 |
Snippet b = classKey(assertEval("class B { public String toString() { return \"B\"; } }",
|
|
|
435 |
added(VALID),
|
|
|
436 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, null)));
|
|
|
437 |
assertEval("new A();", "B");
|
|
|
438 |
assertEval("interface B { }",
|
|
|
439 |
DiagCheck.DIAG_OK,
|
|
|
440 |
DiagCheck.DIAG_ERROR,
|
|
|
441 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
442 |
ste(b, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
443 |
ste(a, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET));
|
|
|
444 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
445 |
assertActiveKeys();
|
|
|
446 |
}
|
|
|
447 |
|
|
|
448 |
public void testForwardClassToClass3() {
|
|
|
449 |
Snippet a = classKey(assertEval("interface A extends B { static int f() { return 10; } }", added(RECOVERABLE_NOT_DEFINED)));
|
|
|
450 |
assertDeclareFail("A.f();", "compiler.err.cant.resolve.location");
|
|
|
451 |
|
|
|
452 |
Snippet b = classKey(assertEval("interface B { }",
|
|
|
453 |
added(VALID),
|
|
|
454 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, null)));
|
|
|
455 |
assertEval("A.f();", "10");
|
|
|
456 |
assertEval("class B { }",
|
|
|
457 |
DiagCheck.DIAG_OK,
|
|
|
458 |
DiagCheck.DIAG_ERROR,
|
|
|
459 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
460 |
ste(b, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
461 |
ste(a, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET));
|
|
|
462 |
assertDeclareFail("A.f();", "compiler.err.cant.resolve.location");
|
|
|
463 |
assertActiveKeys();
|
|
|
464 |
}
|
|
|
465 |
|
|
|
466 |
public void testImportDeclare() {
|
|
|
467 |
Snippet singleImport = importKey(assertEval("import java.util.List;", added(VALID)));
|
|
|
468 |
Snippet importOnDemand = importKey(assertEval("import java.util.*;", added(VALID)));
|
|
|
469 |
Snippet singleStaticImport = importKey(assertEval("import static java.lang.Math.abs;", added(VALID)));
|
|
|
470 |
Snippet staticImportOnDemand = importKey(assertEval("import static java.lang.Math.*;", added(VALID)));
|
|
|
471 |
assertEval("import java.util.List; //again",
|
|
|
472 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
473 |
ste(singleImport, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
474 |
assertEval("import java.util.*; //again",
|
|
|
475 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
476 |
ste(importOnDemand, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
477 |
assertEval("import static java.lang.Math.abs; //again",
|
|
|
478 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
479 |
ste(singleStaticImport, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
480 |
assertEval("import static java.lang.Math.*; //again",
|
|
|
481 |
ste(MAIN_SNIPPET, VALID, VALID, false, null),
|
|
|
482 |
ste(staticImportOnDemand, VALID, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
483 |
assertActiveKeys();
|
|
|
484 |
}
|
|
|
485 |
|
|
|
486 |
public void testForwardVariable() {
|
|
|
487 |
assertEval("int f() { return x; }", added(RECOVERABLE_DEFINED));
|
|
|
488 |
assertEvalUnresolvedException("f();", "f", 1, 0);
|
|
|
489 |
assertActiveKeys();
|
|
|
490 |
}
|
|
|
491 |
|
|
|
492 |
public void testLocalClassInUnresolved() {
|
|
|
493 |
Snippet f = methodKey(assertEval("void f() { class A {} g(); }", added(RECOVERABLE_DEFINED)));
|
|
|
494 |
assertEval("void g() {}",
|
|
|
495 |
added(VALID),
|
|
|
496 |
ste(f, RECOVERABLE_DEFINED, VALID, false, null));
|
|
|
497 |
assertEval("f();", "");
|
|
|
498 |
}
|
|
|
499 |
|
|
|
500 |
@Test(enabled = false) // TODO 8129420
|
|
|
501 |
public void testLocalClassEvolve() {
|
|
|
502 |
Snippet j = methodKey(assertEval("Object j() { return null; }", added(VALID)));
|
|
|
503 |
assertEval("Object j() { class B {}; return null; }",
|
|
|
504 |
ste(MAIN_SNIPPET, VALID, VALID, false, null));
|
|
|
505 |
assertEval("Object j() { class B {}; return new B(); }",
|
|
|
506 |
ste(MAIN_SNIPPET, VALID, VALID, false, null));
|
|
|
507 |
assertEval("j().getClass().getSimpleName();", "\"B\"");
|
|
|
508 |
assertEval("Object j() { class B { int p; public String toString() { return \"Yep\";} }; return new B(); }",
|
|
|
509 |
ste(MAIN_SNIPPET, VALID, VALID, false, null));
|
|
|
510 |
assertEval("j().getClass().getSimpleName();", "\"B\"");
|
|
|
511 |
assertEval("j();", "Yep");
|
|
|
512 |
}
|
|
|
513 |
|
|
|
514 |
public void testForwardSingleImportMethodToMethod() {
|
|
|
515 |
DeclarationSnippet string = methodKey(assertEval("String string() { return format(\"string\"); }",
|
|
|
516 |
added(RECOVERABLE_DEFINED)));
|
|
|
517 |
assertUnresolvedDependencies1(string, RECOVERABLE_DEFINED, "method format(java.lang.String)");
|
|
|
518 |
assertEvalUnresolvedException("string();", "string", 1, 0);
|
|
|
519 |
assertEval("import static java.lang.String.format;",
|
|
|
520 |
added(VALID),
|
|
|
521 |
ste(string, RECOVERABLE_DEFINED, VALID, false, null));
|
|
|
522 |
assertEval("string();", "\"string\"");
|
|
|
523 |
|
|
|
524 |
assertEval("double format(String s) { return 0; }",
|
|
|
525 |
DiagCheck.DIAG_OK,
|
|
|
526 |
DiagCheck.DIAG_ERROR,
|
|
|
527 |
added(VALID),
|
|
|
528 |
ste(string, VALID, RECOVERABLE_DEFINED, false, null));
|
|
|
529 |
assertEvalUnresolvedException("string();", "string", 0, 1);
|
|
|
530 |
assertActiveKeys();
|
|
|
531 |
}
|
|
|
532 |
|
|
|
533 |
public void testForwardImportMethodOnDemandToMethod() {
|
|
|
534 |
DeclarationSnippet string = methodKey(assertEval("String string() { return format(\"string\"); }",
|
|
|
535 |
added(RECOVERABLE_DEFINED)));
|
|
|
536 |
assertUnresolvedDependencies1(string, RECOVERABLE_DEFINED, "method format(java.lang.String)");
|
|
|
537 |
assertEvalUnresolvedException("string();", "string", 1, 0);
|
|
|
538 |
assertEval("import static java.lang.String.*;",
|
|
|
539 |
added(VALID),
|
|
|
540 |
ste(string, RECOVERABLE_DEFINED, VALID, false, null));
|
|
|
541 |
assertEval("string();", "\"string\"");
|
|
|
542 |
|
|
|
543 |
assertEval("double format(String s) { return 0; }",
|
|
|
544 |
DiagCheck.DIAG_OK,
|
|
|
545 |
DiagCheck.DIAG_ERROR,
|
|
|
546 |
added(VALID),
|
|
|
547 |
ste(string, VALID, RECOVERABLE_DEFINED, false, null));
|
|
|
548 |
assertEvalUnresolvedException("string();", "string", 0, 1);
|
|
|
549 |
assertActiveKeys();
|
|
|
550 |
}
|
|
|
551 |
|
|
|
552 |
public void testForwardSingleImportFieldToMethod() {
|
|
|
553 |
DeclarationSnippet pi = methodKey(assertEval("double pi() { return PI; }",
|
|
|
554 |
added(RECOVERABLE_DEFINED)));
|
|
|
555 |
assertUnresolvedDependencies1(pi, RECOVERABLE_DEFINED, "variable PI");
|
|
|
556 |
assertEvalUnresolvedException("pi();", "pi", 1, 0);
|
|
|
557 |
assertEval("import static java.lang.Math.PI;",
|
|
|
558 |
added(VALID),
|
|
|
559 |
ste(pi, RECOVERABLE_DEFINED, VALID, false, null));
|
|
|
560 |
assertEval("Math.abs(pi() - 3.1415) < 0.001;", "true");
|
|
|
561 |
|
|
|
562 |
assertEval("String PI;",
|
|
|
563 |
DiagCheck.DIAG_OK,
|
|
|
564 |
DiagCheck.DIAG_ERROR,
|
|
|
565 |
added(VALID),
|
|
|
566 |
ste(pi, VALID, RECOVERABLE_DEFINED, false, null));
|
|
|
567 |
assertEvalUnresolvedException("pi();", "pi", 0, 1);
|
|
|
568 |
assertActiveKeys();
|
|
|
569 |
}
|
|
|
570 |
|
|
|
571 |
public void testForwardImportFieldOnDemandToMethod() {
|
|
|
572 |
DeclarationSnippet pi = methodKey(assertEval("double pi() { return PI; }",
|
|
|
573 |
added(RECOVERABLE_DEFINED)));
|
|
|
574 |
assertUnresolvedDependencies1(pi, RECOVERABLE_DEFINED, "variable PI");
|
|
|
575 |
assertEvalUnresolvedException("pi();", "pi", 1, 0);
|
|
|
576 |
assertEval("import static java.lang.Math.*;",
|
|
|
577 |
added(VALID),
|
|
|
578 |
ste(pi, RECOVERABLE_DEFINED, VALID, false, MAIN_SNIPPET));
|
|
|
579 |
assertEval("Math.abs(pi() - 3.1415) < 0.001;", "true");
|
|
|
580 |
|
|
|
581 |
assertEval("String PI;",
|
|
|
582 |
DiagCheck.DIAG_OK,
|
|
|
583 |
DiagCheck.DIAG_ERROR,
|
|
|
584 |
added(VALID),
|
|
|
585 |
ste(pi, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET));
|
|
|
586 |
assertEvalUnresolvedException("pi();", "pi", 0, 1);
|
|
|
587 |
assertActiveKeys();
|
|
|
588 |
}
|
|
|
589 |
|
|
|
590 |
public void testForwardSingleImportMethodToClass1() {
|
|
|
591 |
PersistentSnippet a = classKey(assertEval("class A { String s = format(\"%d\", 10); }",
|
|
36499
|
592 |
added(RECOVERABLE_DEFINED)));
|
|
|
593 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
594 |
assertEval("import static java.lang.String.format;",
|
|
|
595 |
added(VALID),
|
|
36499
|
596 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null));
|
|
33362
|
597 |
assertEval("new A().s;", "\"10\"");
|
|
|
598 |
PersistentSnippet format = methodKey(assertEval("void format(String s, int d) { }",
|
|
|
599 |
DiagCheck.DIAG_OK,
|
|
|
600 |
DiagCheck.DIAG_ERROR,
|
|
|
601 |
added(VALID),
|
|
36499
|
602 |
ste(a, VALID, RECOVERABLE_DEFINED, false, MAIN_SNIPPET)));
|
|
|
603 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
604 |
assertActiveKeys();
|
|
|
605 |
assertDrop(format,
|
|
|
606 |
ste(format, VALID, DROPPED, true, null),
|
|
36499
|
607 |
ste(a, RECOVERABLE_DEFINED, VALID, false, format));
|
|
33362
|
608 |
}
|
|
|
609 |
|
|
|
610 |
public void testForwardSingleImportMethodToClass2() {
|
|
|
611 |
PersistentSnippet a = classKey(assertEval("class A { String s() { return format(\"%d\", 10); } }",
|
|
36499
|
612 |
added(RECOVERABLE_DEFINED)));
|
|
|
613 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
614 |
assertEval("import static java.lang.String.format;",
|
|
|
615 |
added(VALID),
|
|
36499
|
616 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null));
|
|
33362
|
617 |
assertEval("new A().s();", "\"10\"");
|
|
|
618 |
PersistentSnippet format = methodKey(assertEval("void format(String s, int d) { }",
|
|
|
619 |
DiagCheck.DIAG_OK,
|
|
|
620 |
DiagCheck.DIAG_ERROR,
|
|
|
621 |
added(VALID),
|
|
36499
|
622 |
ste(a, VALID, RECOVERABLE_DEFINED, false, null)));
|
|
|
623 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
624 |
assertActiveKeys();
|
|
|
625 |
assertDrop(format,
|
|
|
626 |
ste(format, VALID, DROPPED, true, null),
|
|
36499
|
627 |
ste(a, RECOVERABLE_DEFINED, VALID, false, format));
|
|
33362
|
628 |
}
|
|
|
629 |
|
|
|
630 |
public void testForwardSingleImportClassToClass1() {
|
|
|
631 |
PersistentSnippet a = classKey(assertEval("class A { static List<Integer> list; }",
|
|
|
632 |
added(RECOVERABLE_NOT_DEFINED)));
|
|
|
633 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
634 |
assertEval("import java.util.List;",
|
|
|
635 |
added(VALID),
|
|
|
636 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, null));
|
|
|
637 |
assertEval("import java.util.Arrays;", added(VALID));
|
|
|
638 |
assertEval("A.list = Arrays.asList(1, 2, 3);", "[1, 2, 3]");
|
|
|
639 |
|
|
|
640 |
PersistentSnippet list = classKey(assertEval("class List {}",
|
|
|
641 |
DiagCheck.DIAG_OK,
|
|
|
642 |
DiagCheck.DIAG_ERROR,
|
|
|
643 |
added(VALID),
|
|
|
644 |
ste(a, VALID, RECOVERABLE_NOT_DEFINED, true, null)));
|
|
|
645 |
assertDeclareFail("A.list = Arrays.asList(1, 2, 3);", "compiler.err.already.defined.static.single.import");
|
|
|
646 |
assertActiveKeys();
|
|
|
647 |
assertDrop(list,
|
|
|
648 |
ste(list, VALID, DROPPED, true, null),
|
|
|
649 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, list));
|
|
|
650 |
}
|
|
|
651 |
|
|
|
652 |
public void testForwardSingleImportClassToClass2() {
|
|
|
653 |
PersistentSnippet clsA = classKey(assertEval("class A extends ArrayList<Integer> { }",
|
|
|
654 |
added(RECOVERABLE_NOT_DEFINED)));
|
|
|
655 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
656 |
assertEval("import java.util.ArrayList;",
|
|
|
657 |
added(VALID),
|
|
|
658 |
ste(clsA, RECOVERABLE_NOT_DEFINED, VALID, true, MAIN_SNIPPET));
|
|
|
659 |
Snippet vara = varKey(assertEval("A a = new A();", "[]"));
|
|
|
660 |
|
|
|
661 |
PersistentSnippet arraylist = classKey(assertEval("class ArrayList {}",
|
|
|
662 |
DiagCheck.DIAG_OK,
|
|
|
663 |
DiagCheck.DIAG_ERROR,
|
|
|
664 |
added(VALID),
|
|
|
665 |
ste(clsA, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET),
|
|
|
666 |
ste(vara, VALID, RECOVERABLE_NOT_DEFINED, true, clsA)));
|
|
|
667 |
assertDeclareFail("A a = new A();", "compiler.err.cant.resolve.location",
|
|
|
668 |
ste(MAIN_SNIPPET, RECOVERABLE_NOT_DEFINED, REJECTED, false, null),
|
|
|
669 |
ste(vara, RECOVERABLE_NOT_DEFINED, OVERWRITTEN, false, MAIN_SNIPPET));
|
|
|
670 |
assertActiveKeys();
|
|
|
671 |
assertDrop(arraylist,
|
|
|
672 |
ste(arraylist, VALID, DROPPED, true, null),
|
|
|
673 |
ste(clsA, RECOVERABLE_NOT_DEFINED, VALID, true, arraylist));
|
|
|
674 |
}
|
|
|
675 |
|
|
|
676 |
public void testForwardImportOnDemandMethodToClass1() {
|
|
|
677 |
PersistentSnippet a = classKey(assertEval("class A { String s = format(\"%d\", 10); }",
|
|
36499
|
678 |
added(RECOVERABLE_DEFINED)));
|
|
|
679 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
680 |
assertEval("import static java.lang.String.*;",
|
|
|
681 |
added(VALID),
|
|
36499
|
682 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null));
|
|
|
683 |
assertEval("A x = new A();");
|
|
|
684 |
assertEval("x.s;", "\"10\"");
|
|
33362
|
685 |
PersistentSnippet format = methodKey(assertEval("void format(String s, int d) { }",
|
|
|
686 |
DiagCheck.DIAG_OK,
|
|
|
687 |
DiagCheck.DIAG_ERROR,
|
|
|
688 |
added(VALID),
|
|
36499
|
689 |
ste(a, VALID, RECOVERABLE_DEFINED, false, null)));
|
|
|
690 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
691 |
assertActiveKeys();
|
|
|
692 |
assertDrop(format,
|
|
|
693 |
ste(format, VALID, DROPPED, true, null),
|
|
36499
|
694 |
ste(a, RECOVERABLE_DEFINED, VALID, false, format));
|
|
|
695 |
assertEval("x.s;", "\"10\"");
|
|
33362
|
696 |
}
|
|
|
697 |
|
|
|
698 |
public void testForwardImportOnDemandMethodToClass2() {
|
|
|
699 |
PersistentSnippet a = classKey(assertEval("class A { String s() { return format(\"%d\", 10); } }",
|
|
36499
|
700 |
added(RECOVERABLE_DEFINED)));
|
|
|
701 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
702 |
assertEval("import static java.lang.String.*;",
|
|
|
703 |
added(VALID),
|
|
36499
|
704 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null));
|
|
33362
|
705 |
assertEval("new A().s();", "\"10\"");
|
|
|
706 |
PersistentSnippet format = methodKey(assertEval("void format(String s, int d) { }",
|
|
|
707 |
DiagCheck.DIAG_OK,
|
|
|
708 |
DiagCheck.DIAG_ERROR,
|
|
|
709 |
added(VALID),
|
|
36499
|
710 |
ste(a, VALID, RECOVERABLE_DEFINED, false, null)));
|
|
|
711 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
712 |
assertActiveKeys();
|
|
|
713 |
assertDrop(format,
|
|
|
714 |
ste(format, VALID, DROPPED, true, null),
|
|
36499
|
715 |
ste(a, RECOVERABLE_DEFINED, VALID, false, format));
|
|
33362
|
716 |
}
|
|
|
717 |
|
|
|
718 |
public void testForwardImportOnDemandClassToClass1() {
|
|
|
719 |
PersistentSnippet a = classKey(assertEval("class A { static List<Integer> list; }",
|
|
|
720 |
added(RECOVERABLE_NOT_DEFINED)));
|
|
|
721 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
722 |
assertEval("import java.util.*;",
|
|
|
723 |
added(VALID),
|
|
|
724 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, null));
|
|
|
725 |
assertEval("A.list = Arrays.asList(1, 2, 3);", "[1, 2, 3]");
|
|
|
726 |
|
|
|
727 |
PersistentSnippet list = classKey(assertEval("class List {}",
|
|
|
728 |
DiagCheck.DIAG_OK,
|
|
|
729 |
DiagCheck.DIAG_ERROR,
|
|
|
730 |
added(VALID),
|
|
|
731 |
ste(a, VALID, RECOVERABLE_NOT_DEFINED, true, null)));
|
|
|
732 |
assertDeclareFail("A.list = Arrays.asList(1, 2, 3);", "compiler.err.cant.resolve.location");
|
|
|
733 |
assertActiveKeys();
|
|
|
734 |
assertDrop(list,
|
|
|
735 |
ste(list, VALID, DROPPED, true, null),
|
|
|
736 |
ste(a, RECOVERABLE_NOT_DEFINED, VALID, true, list));
|
|
|
737 |
}
|
|
|
738 |
|
|
|
739 |
public void testForwardImportOnDemandClassToClass2() {
|
|
|
740 |
PersistentSnippet clsA = classKey(assertEval("class A extends ArrayList<Integer> { }",
|
|
|
741 |
added(RECOVERABLE_NOT_DEFINED)));
|
|
|
742 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
743 |
assertEval("import java.util.*;",
|
|
|
744 |
added(VALID),
|
|
|
745 |
ste(clsA, RECOVERABLE_NOT_DEFINED, VALID, true, MAIN_SNIPPET));
|
|
|
746 |
Snippet vara = varKey(assertEval("A a = new A();", "[]"));
|
|
|
747 |
|
|
|
748 |
PersistentSnippet arraylist = classKey(assertEval("class ArrayList {}",
|
|
|
749 |
DiagCheck.DIAG_OK,
|
|
|
750 |
DiagCheck.DIAG_ERROR,
|
|
|
751 |
added(VALID),
|
|
|
752 |
ste(clsA, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET),
|
|
|
753 |
ste(vara, VALID, RECOVERABLE_NOT_DEFINED, true, clsA)));
|
|
|
754 |
assertDeclareFail("new A();", "compiler.err.cant.resolve.location");
|
|
|
755 |
assertActiveKeys();
|
|
|
756 |
assertDrop(arraylist,
|
|
|
757 |
ste(arraylist, VALID, DROPPED, true, null),
|
|
|
758 |
ste(clsA, RECOVERABLE_NOT_DEFINED, VALID, true, arraylist),
|
|
|
759 |
ste(vara, RECOVERABLE_NOT_DEFINED, VALID, true, clsA));
|
|
|
760 |
}
|
|
|
761 |
|
|
|
762 |
public void testForwardSingleImportFieldToClass1() {
|
|
|
763 |
PersistentSnippet a = classKey(assertEval("class A { static double pi() { return PI; } }",
|
|
36499
|
764 |
added(RECOVERABLE_DEFINED)));
|
|
|
765 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
766 |
assertEval("import static java.lang.Math.PI;",
|
|
|
767 |
added(VALID),
|
|
36499
|
768 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null));
|
|
33362
|
769 |
assertEval("Math.abs(A.pi() - 3.1415) < 0.001;", "true");
|
|
|
770 |
|
|
|
771 |
PersistentSnippet list = varKey(assertEval("String PI;",
|
|
|
772 |
DiagCheck.DIAG_OK,
|
|
|
773 |
DiagCheck.DIAG_ERROR,
|
|
|
774 |
added(VALID),
|
|
36499
|
775 |
ste(a, VALID, RECOVERABLE_DEFINED, false, null)));
|
|
|
776 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
777 |
assertActiveKeys();
|
|
|
778 |
assertDrop(list,
|
|
|
779 |
ste(list, VALID, DROPPED, true, null),
|
|
36499
|
780 |
ste(a, RECOVERABLE_DEFINED, VALID, false, list));
|
|
33362
|
781 |
}
|
|
|
782 |
|
|
|
783 |
public void testForwardSingleImportFieldToClass2() {
|
|
|
784 |
PersistentSnippet a = classKey(assertEval("class A { static double pi = PI; }",
|
|
36499
|
785 |
added(RECOVERABLE_DEFINED)));
|
|
|
786 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
787 |
assertEval("import static java.lang.Math.PI;",
|
|
|
788 |
added(VALID),
|
|
36499
|
789 |
ste(a, RECOVERABLE_DEFINED, VALID, true, null));
|
|
33362
|
790 |
assertEval("Math.abs(A.pi - 3.1415) < 0.001;", "true");
|
|
|
791 |
|
|
|
792 |
PersistentSnippet list = varKey(assertEval("String PI;",
|
|
|
793 |
DiagCheck.DIAG_OK,
|
|
|
794 |
DiagCheck.DIAG_ERROR,
|
|
|
795 |
added(VALID),
|
|
36499
|
796 |
ste(a, VALID, RECOVERABLE_DEFINED, true, null)));
|
|
|
797 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
798 |
assertActiveKeys();
|
|
|
799 |
assertDrop(list,
|
|
|
800 |
ste(list, VALID, DROPPED, true, null),
|
|
36499
|
801 |
ste(a, RECOVERABLE_DEFINED, VALID, true, list));
|
|
33362
|
802 |
}
|
|
|
803 |
|
|
|
804 |
public void testForwardImportOnDemandFieldToClass1() {
|
|
|
805 |
PersistentSnippet a = classKey(assertEval("class A { static double pi() { return PI; } }",
|
|
36499
|
806 |
added(RECOVERABLE_DEFINED)));
|
|
|
807 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
808 |
assertEval("import static java.lang.Math.*;",
|
|
|
809 |
added(VALID),
|
|
36499
|
810 |
ste(a, RECOVERABLE_DEFINED, VALID, false, null));
|
|
33362
|
811 |
assertEval("Math.abs(A.pi() - 3.1415) < 0.001;", "true");
|
|
|
812 |
|
|
|
813 |
PersistentSnippet list = varKey(assertEval("String PI;",
|
|
|
814 |
DiagCheck.DIAG_OK,
|
|
|
815 |
DiagCheck.DIAG_ERROR,
|
|
|
816 |
added(VALID),
|
|
36499
|
817 |
ste(a, VALID, RECOVERABLE_DEFINED, false, null)));
|
|
|
818 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
819 |
assertActiveKeys();
|
|
|
820 |
assertDrop(list,
|
|
|
821 |
ste(list, VALID, DROPPED, true, null),
|
|
36499
|
822 |
ste(a, RECOVERABLE_DEFINED, VALID, false, list));
|
|
33362
|
823 |
}
|
|
|
824 |
|
|
|
825 |
public void testForwardImportOnDemandFieldToClass2() {
|
|
|
826 |
PersistentSnippet a = classKey(assertEval("class A { static double pi = PI; }",
|
|
36499
|
827 |
added(RECOVERABLE_DEFINED)));
|
|
|
828 |
assertEvalUnresolvedException("new A();", "A", 1, 0);
|
|
33362
|
829 |
assertEval("import static java.lang.Math.*;",
|
|
|
830 |
added(VALID),
|
|
36499
|
831 |
ste(a, RECOVERABLE_DEFINED, VALID, true, null));
|
|
33362
|
832 |
assertEval("Math.abs(A.pi - 3.1415) < 0.001;", "true");
|
|
|
833 |
|
|
|
834 |
PersistentSnippet list = varKey(assertEval("String PI;",
|
|
|
835 |
DiagCheck.DIAG_OK,
|
|
|
836 |
DiagCheck.DIAG_ERROR,
|
|
|
837 |
added(VALID),
|
|
36499
|
838 |
ste(a, VALID, RECOVERABLE_DEFINED, true, null)));
|
|
|
839 |
assertEvalUnresolvedException("new A();", "A", 0, 1);
|
|
33362
|
840 |
assertActiveKeys();
|
|
|
841 |
assertDrop(list,
|
|
|
842 |
ste(list, VALID, DROPPED, true, null),
|
|
36499
|
843 |
ste(a, RECOVERABLE_DEFINED, VALID, true, list));
|
|
|
844 |
assertEval("Math.abs(A.pi - 3.1415) < 0.001;", "true");
|
|
33362
|
845 |
}
|
|
|
846 |
|
|
|
847 |
public void testReplaceCausesMethodReferenceError() {
|
|
|
848 |
Snippet l = classKey(assertEval("interface Logger { public void log(String message); }", added(VALID)));
|
|
|
849 |
Snippet v = varKey(assertEval("Logger l = System.out::println;", added(VALID)));
|
|
|
850 |
assertEval("interface Logger { public boolean accept(String message); }",
|
|
|
851 |
DiagCheck.DIAG_OK,
|
|
|
852 |
DiagCheck.DIAG_ERROR,
|
|
|
853 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
854 |
ste(l, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
855 |
ste(v, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET));
|
|
|
856 |
}
|
|
|
857 |
|
|
|
858 |
public void testReplaceCausesClassCompilationError() {
|
|
|
859 |
Snippet l = classKey(assertEval("interface L { }", added(VALID)));
|
|
|
860 |
Snippet c = classKey(assertEval("class C implements L { }", added(VALID)));
|
|
|
861 |
assertEval("interface L { void m(); }",
|
|
|
862 |
DiagCheck.DIAG_OK,
|
|
|
863 |
DiagCheck.DIAG_ERROR,
|
|
|
864 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
865 |
ste(l, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
866 |
ste(c, VALID, RECOVERABLE_NOT_DEFINED, true, MAIN_SNIPPET));
|
|
|
867 |
}
|
|
|
868 |
|
|
|
869 |
public void testOverwriteNoUpdate() {
|
|
|
870 |
String xsi = "int x = 5;";
|
|
|
871 |
String xsd = "double x = 3.14159;";
|
|
|
872 |
VarSnippet xi = varKey(assertEval(xsi, added(VALID)));
|
|
|
873 |
String ms1 = "double m(Integer i) { return i + x; }";
|
|
|
874 |
String ms2 = "double m(java.lang.Integer i) { return i + x; }";
|
|
|
875 |
MethodSnippet k1 = methodKey(assertEval(ms1, added(VALID)));
|
|
|
876 |
VarSnippet xd = varKey(assertEval(xsd,
|
|
|
877 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
878 |
ste(xi, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
879 |
ste(k1, VALID, VALID, false, MAIN_SNIPPET)));
|
|
|
880 |
MethodSnippet k2 = methodKey(assertEval(ms2,
|
|
|
881 |
ste(MAIN_SNIPPET, VALID, VALID, true, null), //TODO: technically, should be false
|
|
|
882 |
ste(k1, VALID, OVERWRITTEN, false, MAIN_SNIPPET)));
|
|
|
883 |
VarSnippet xi2 = varKey(assertEval(xsi,
|
|
|
884 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
885 |
ste(xd, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
886 |
ste(k2, VALID, VALID, false, MAIN_SNIPPET)));
|
|
|
887 |
varKey(assertEval(xsd,
|
|
|
888 |
ste(MAIN_SNIPPET, VALID, VALID, true, null),
|
|
|
889 |
ste(xi2, VALID, OVERWRITTEN, false, MAIN_SNIPPET),
|
|
|
890 |
ste(k2, VALID, VALID, false, MAIN_SNIPPET)));
|
|
|
891 |
}
|
|
|
892 |
}
|