View | Details | Raw Unified | Return to bug 162865 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/model/JavadocTextCompletionModelTest.java (-162 / +162 lines)
Lines 229-236 Link Here
229
		"}\n";
229
		"}\n";
230
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
230
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
231
	assertSortedResults(
231
	assertSortedResults(
232
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNRIT+"}\n" + 
232
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNRIT+"}\n" + 
233
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNR+"}"
233
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNR+"}"
234
	);
234
	);
235
}
235
}
236
236
Lines 246-253 Link Here
246
		"}\n";
246
		"}\n";
247
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
247
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
248
	assertSortedResults(
248
	assertSortedResults(
249
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNR+"}\n" + 
249
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNR+"}\n" + 
250
		"BasicTestTextInsException[TYPE_REF]{BasicTestTextInsException, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DICUNR+"}"
250
		"BasicTestTextInsException[TYPE_REF]{BasicTestTextInsException, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DRICUNR+"}"
251
	);
251
	);
252
}
252
}
253
253
Lines 264-273 Link Here
264
		"}\n";
264
		"}\n";
265
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
265
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
266
	assertSortedResults(
266
	assertSortedResults(
267
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+(R_DICENUNR+R_INLINE_TAG)+"}\n" +
267
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+(R_DRICENUNR+R_INLINE_TAG)+"}\n" +
268
		"BasicTestTextInsException[JAVADOC_TYPE_REF]{{@link BasicTestTextInsException}, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DICUNRIT+"}\n" + 
268
		"BasicTestTextInsException[JAVADOC_TYPE_REF]{{@link BasicTestTextInsException}, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DRICUNRIT+"}\n" + 
269
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNR+"}\n" +
269
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNR+"}\n" +
270
		"BasicTestTextInsException[TYPE_REF]{BasicTestTextInsException, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DICUNR+"}"
270
		"BasicTestTextInsException[TYPE_REF]{BasicTestTextInsException, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DRICUNR+"}"
271
	);
271
	);
272
}
272
}
273
273
Lines 284-293 Link Here
284
		"}\n";
284
		"}\n";
285
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns", 2); // 2nd occurrence
285
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns", 2); // 2nd occurrence
286
	assertSortedResults(
286
	assertSortedResults(
287
		"BasicTestTextInsException[JAVADOC_TYPE_REF]{{@link BasicTestTextInsException}, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DICUNREETIT+"}\n" + 
287
		"BasicTestTextInsException[JAVADOC_TYPE_REF]{{@link BasicTestTextInsException}, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DRICUNREETIT+"}\n" + 
288
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNRIT+"}\n" +
288
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNRIT+"}\n" +
289
		"BasicTestTextInsException[TYPE_REF]{BasicTestTextInsException, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DICUNREET+"}\n" + 
289
		"BasicTestTextInsException[TYPE_REF]{BasicTestTextInsException, javadoc.text, Ljavadoc.text.BasicTestTextInsException;, null, null, "+this.positions+R_DRICUNREET+"}\n" + 
290
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNR+"}"
290
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNR+"}"
291
	);
291
	);
292
}
292
}
293
293
Lines 302-309 Link Here
302
		"}\n";
302
		"}\n";
303
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
303
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns");
304
	assertSortedResults(
304
	assertSortedResults(
305
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNRIT+"}\n" + 
305
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNRIT+"}\n" + 
306
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNR+"}"
306
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNR+"}"
307
	);
307
	);
308
}
308
}
309
309
Lines 318-325 Link Here
318
		"}\n";
318
		"}\n";
319
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns", 2); // 2nd occurrence
319
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns", 2); // 2nd occurrence
320
	assertSortedResults(
320
	assertSortedResults(
321
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNRIT+"}\n" + 
321
		"BasicTestTextIns[JAVADOC_TYPE_REF]{{@link BasicTestTextIns}, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNRIT+"}\n" + 
322
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DICENUNR+"}"
322
		"BasicTestTextIns[TYPE_REF]{BasicTestTextIns, javadoc.text, Ljavadoc.text.BasicTestTextIns;, null, null, "+this.positions+R_DRICENUNR+"}"
323
	);
323
	);
324
}
324
}
325
325
Lines 335-341 Link Here
335
		"}\n";
335
		"}\n";
336
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "java.la");
336
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "java.la");
337
	assertSortedResults(
337
	assertSortedResults(
338
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}"
338
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}"
339
	);
339
	);
340
}
340
}
341
341
Lines 351-360 Link Here
351
		"}\n";
351
		"}\n";
352
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "java.lang.I");
352
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "java.lang.I");
353
	assertSortedResults(
353
	assertSortedResults(
354
		"IllegalMonitorStateException[JAVADOC_TYPE_REF]{{@link IllegalMonitorStateException}, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNRIT+"}\n" + 
354
		"IllegalMonitorStateException[JAVADOC_TYPE_REF]{{@link IllegalMonitorStateException}, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNRIT+"}\n" + 
355
		"InterruptedException[JAVADOC_TYPE_REF]{{@link InterruptedException}, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNRIT+"}\n" + 
355
		"InterruptedException[JAVADOC_TYPE_REF]{{@link InterruptedException}, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNRIT+"}\n" + 
356
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNR+"}\n" +
356
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNR+"}\n" +
357
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNR+"}"
357
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNR+"}"
358
	);
358
	);
359
}
359
}
360
360
Lines 370-379 Link Here
370
		"}\n";
370
		"}\n";
371
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "java.lang.I");
371
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "java.lang.I");
372
	assertSortedResults(
372
	assertSortedResults(
373
		"InterruptedException[JAVADOC_TYPE_REF]{{@link InterruptedException}, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNREETIT+"}\n" + 
373
		"InterruptedException[JAVADOC_TYPE_REF]{{@link InterruptedException}, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNREETIT+"}\n" + 
374
		"IllegalMonitorStateException[JAVADOC_TYPE_REF]{{@link IllegalMonitorStateException}, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNRIT+"}\n" + 
374
		"IllegalMonitorStateException[JAVADOC_TYPE_REF]{{@link IllegalMonitorStateException}, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNRIT+"}\n" + 
375
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNREET+"}\n" + 
375
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNREET+"}\n" + 
376
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNR+"}"
376
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNR+"}"
377
	);
377
	);
378
}
378
}
379
379
Lines 391-397 Link Here
391
		"}";
391
		"}";
392
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#fo");
392
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#fo");
393
	assertSortedResults(
393
	assertSortedResults(
394
		"foo[JAVADOC_FIELD_REF]{{@link #foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNSIT+"}"
394
		"foo[JAVADOC_FIELD_REF]{{@link #foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRNSIT+"}"
395
	);
395
	);
396
}
396
}
397
397
Lines 406-413 Link Here
406
		"}";
406
		"}";
407
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#fo");
407
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#fo");
408
	assertSortedResults(
408
	assertSortedResults(
409
		"foo[JAVADOC_FIELD_REF]{{@link BasicTestTextIns#foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRIT+"}\n" + 
409
		"foo[JAVADOC_FIELD_REF]{{@link BasicTestTextIns#foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRIT+"}\n" + 
410
		"foo[JAVADOC_VALUE_REF]{{@value BasicTestTextIns#foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRIT+"}"
410
		"foo[JAVADOC_VALUE_REF]{{@value BasicTestTextIns#foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRIT+"}"
411
	);
411
	);
412
}
412
}
413
413
Lines 422-428 Link Here
422
		"}";
422
		"}";
423
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.BasicTestTextIns#fo");
423
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.BasicTestTextIns#fo");
424
	assertSortedResults(
424
	assertSortedResults(
425
		"foo[JAVADOC_FIELD_REF]{{@link javadoc.text.BasicTestTextIns#foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNSIT+"}"
425
		"foo[JAVADOC_FIELD_REF]{{@link javadoc.text.BasicTestTextIns#foo}, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRNSIT+"}"
426
	);
426
	);
427
}
427
}
428
428
Lines 444-451 Link Here
444
	};
444
	};
445
	completeInJavadoc(sources, true, "OtherFields#fo");
445
	completeInJavadoc(sources, true, "OtherFields#fo");
446
	assertSortedResults(
446
	assertSortedResults(
447
		"foo[JAVADOC_FIELD_REF]{{@link OtherFields#foo}, Ljavadoc.text.OtherFields;, I, foo, null, "+this.positions+R_DICNRIT+"}\n" + 
447
		"foo[JAVADOC_FIELD_REF]{{@link OtherFields#foo}, Ljavadoc.text.OtherFields;, I, foo, null, "+this.positions+R_DRICNRIT+"}\n" + 
448
		"foo[JAVADOC_VALUE_REF]{{@value OtherFields#foo}, Ljavadoc.text.OtherFields;, I, foo, null, "+this.positions+R_DICNRIT+"}"
448
		"foo[JAVADOC_VALUE_REF]{{@value OtherFields#foo}, Ljavadoc.text.OtherFields;, I, foo, null, "+this.positions+R_DRICNRIT+"}"
449
	);
449
	);
450
}
450
}
451
451
Lines 461-467 Link Here
461
		"}";
461
		"}";
462
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
462
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
463
	assertSortedResults(
463
	assertSortedResults(
464
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNS+"}"
464
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
465
	);
465
	);
466
}
466
}
467
467
Lines 478-484 Link Here
478
		"}";
478
		"}";
479
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
479
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
480
	assertSortedResults(
480
	assertSortedResults(
481
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNS+"}"
481
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
482
	);
482
	);
483
}
483
}
484
484
Lines 493-499 Link Here
493
		"}";
493
		"}";
494
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
494
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
495
	assertSortedResults(
495
	assertSortedResults(
496
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNR+"}"
496
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNR+"}"
497
	);
497
	);
498
}
498
}
499
499
Lines 508-514 Link Here
508
		"}";
508
		"}";
509
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
509
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "fo");
510
	assertSortedResults(
510
	assertSortedResults(
511
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DICNRNS+"}"
511
		"foo[FIELD_REF]{foo, Ljavadoc.text.BasicTestTextIns;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
512
	);
512
	);
513
}
513
}
514
514
Lines 532-538 Link Here
532
	};
532
	};
533
	completeInJavadoc(sources, true, "fo");
533
	completeInJavadoc(sources, true, "fo");
534
	assertSortedResults(
534
	assertSortedResults(
535
		"foo[FIELD_REF]{foo, Ljavadoc.text.OtherFields;, I, foo, null, "+this.positions+R_DICNR+"}"
535
		"foo[FIELD_REF]{foo, Ljavadoc.text.OtherFields;, I, foo, null, "+this.positions+R_DRICNR+"}"
536
	);
536
	);
537
}
537
}
538
538
Lines 565-571 Link Here
565
		"}\n";
565
		"}\n";
566
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth");
566
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth");
567
	assertSortedResults(
567
	assertSortedResults(
568
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}"
568
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}"
569
	);
569
	);
570
}
570
}
571
571
Lines 581-587 Link Here
581
		"}\n";
581
		"}\n";
582
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth");
582
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth");
583
	assertSortedResults(
583
	assertSortedResults(
584
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}"
584
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}"
585
	);
585
	);
586
}
586
}
587
587
Lines 597-603 Link Here
597
		"}\n";
597
		"}\n";
598
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth");
598
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#meth");
599
	assertSortedResults(
599
	assertSortedResults(
600
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}"
600
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}"
601
	);
601
	);
602
}
602
}
603
603
Lines 613-619 Link Here
613
		"}\n";
613
		"}\n";
614
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#param");
614
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#param");
615
	assertSortedResults(
615
	assertSortedResults(
616
		"paramMethod[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNSIT+"}"
616
		"paramMethod[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNSIT+"}"
617
	);
617
	);
618
}
618
}
619
619
Lines 629-635 Link Here
629
		"}\n";
629
		"}\n";
630
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.BasicTestTextIns#meth");
630
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.BasicTestTextIns#meth");
631
	assertSortedResults(
631
	assertSortedResults(
632
		"method[JAVADOC_METHOD_REF]{{@link javadoc.text.BasicTestTextIns#method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}"
632
		"method[JAVADOC_METHOD_REF]{{@link javadoc.text.BasicTestTextIns#method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}"
633
	);
633
	);
634
}
634
}
635
635
Lines 645-651 Link Here
645
		"}\n";
645
		"}\n";
646
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "param");
646
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "param");
647
	assertSortedResults(
647
	assertSortedResults(
648
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNS+"}"
648
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNS+"}"
649
	);
649
	);
650
}
650
}
651
651
Lines 661-667 Link Here
661
		"}\n";
661
		"}\n";
662
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "meth");
662
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "meth");
663
	assertSortedResults(
663
	assertSortedResults(
664
		"method[METHOD_REF]{method(), Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
664
		"method[METHOD_REF]{method(), Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
665
	);
665
	);
666
}
666
}
667
667
Lines 677-683 Link Here
677
		"}\n";
677
		"}\n";
678
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "param");
678
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "param");
679
	assertSortedResults(
679
	assertSortedResults(
680
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNS+"}"
680
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNS+"}"
681
	);
681
	);
682
}
682
}
683
683
Lines 699-705 Link Here
699
	};
699
	};
700
	completeInJavadoc(sources, true, "OtherTypes#meth");
700
	completeInJavadoc(sources, true, "OtherTypes#meth");
701
	assertSortedResults(
701
	assertSortedResults(
702
		"method[JAVADOC_METHOD_REF]{{@link OtherTypes#method()}, Ljavadoc.text.OtherTypes;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}"
702
		"method[JAVADOC_METHOD_REF]{{@link OtherTypes#method()}, Ljavadoc.text.OtherTypes;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}"
703
	);
703
	);
704
}
704
}
705
705
Lines 721-727 Link Here
721
	};
721
	};
722
	completeInJavadoc(sources, true, "meth");
722
	completeInJavadoc(sources, true, "meth");
723
	assertSortedResults(
723
	assertSortedResults(
724
		"method[METHOD_REF]{method(), Ljavadoc.text.OtherTypes;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
724
		"method[METHOD_REF]{method(), Ljavadoc.text.OtherTypes;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
725
	);
725
	);
726
}
726
}
727
727
Lines 737-756 Link Here
737
		"}\n";
737
		"}\n";
738
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
738
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
739
	assertSortedResults(
739
	assertSortedResults(
740
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNSIT+"}\n" + 
740
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
741
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DICNRNSIT+"}\n" + 
741
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
742
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNSIT+"}\n" + 
742
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
743
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNSIT+"}\n" + 
743
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
744
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNSIT+"}\n" + 
744
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
745
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}\n" + 
745
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
746
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNSIT+"}\n" + 
746
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
747
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNSIT+"}\n" + 
747
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
748
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNSIT+"}\n" + 
748
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNSIT+"}\n" + 
749
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNSIT+"}\n" + 
749
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
750
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
750
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
751
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
751
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
752
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
752
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
753
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+(JAVADOC_RELEVANCE+R_INLINE_TAG)+"}"
753
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+(R_DRINRIT)+"}"
754
	);
754
	);
755
}
755
}
756
756
Lines 766-785 Link Here
766
		"}\n";
766
		"}\n";
767
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
767
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
768
	assertSortedResults(
768
	assertSortedResults(
769
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNSIT+"}\n" + 
769
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
770
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DICNRNSIT+"}\n" + 
770
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
771
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNSIT+"}\n" + 
771
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
772
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNSIT+"}\n" + 
772
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
773
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNSIT+"}\n" + 
773
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
774
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNSIT+"}\n" + 
774
		"method[JAVADOC_METHOD_REF]{{@link #method()}, Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
775
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNSIT+"}\n" + 
775
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
776
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNSIT+"}\n" + 
776
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
777
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNSIT+"}\n" + 
777
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNSIT+"}\n" + 
778
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNSIT+"}\n" + 
778
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
779
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
779
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
780
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
780
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
781
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
781
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
782
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+(JAVADOC_RELEVANCE+R_INLINE_TAG)+"}"
782
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+(R_DRINRIT)+"}"
783
	);
783
	);
784
}
784
}
785
785
Lines 795-814 Link Here
795
		"}\n";
795
		"}\n";
796
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#", 0); //empty token
796
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#", 0); //empty token
797
	assertSortedResults(
797
	assertSortedResults(
798
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
798
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
799
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
799
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
800
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
800
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
801
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
801
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
802
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
802
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
803
		"method[METHOD_REF]{method(), Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNS+"}\n" + 
803
		"method[METHOD_REF]{method(), Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNS+"}\n" + 
804
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
804
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
805
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
805
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
806
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
806
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
807
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
807
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
808
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
808
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
809
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
809
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
810
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
810
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
811
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE+"}"
811
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINR+"}"
812
	);
812
	);
813
}
813
}
814
814
Lines 824-843 Link Here
824
		"}\n";
824
		"}\n";
825
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#", 0); //empty token
825
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#", 0); //empty token
826
	assertSortedResults(
826
	assertSortedResults(
827
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
827
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
828
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
828
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
829
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
829
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
830
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
830
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
831
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
831
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
832
		"method[METHOD_REF]{method(), Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DICNRNS+"}\n" + 
832
		"method[METHOD_REF]{method(), Ljavadoc.text.BasicTestTextIns;, ()V, method, null, "+this.positions+R_DRICNRNS+"}\n" + 
833
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
833
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
834
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
834
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
835
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
835
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
836
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
836
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
837
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
837
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
838
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
838
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
839
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
839
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
840
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE+"}"
840
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINR+"}"
841
	);
841
	);
842
}
842
}
843
843
Lines 853-859 Link Here
853
		"}\n";
853
		"}\n";
854
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#paramMethod(");
854
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#paramMethod(");
855
	assertSortedResults(
855
	assertSortedResults(
856
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICENUNRIT+"}"
856
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICENUNRIT+"}"
857
	);
857
	);
858
}
858
}
859
859
Lines 869-875 Link Here
869
		"}\n";
869
		"}\n";
870
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Str");
870
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Str");
871
	assertSortedResults(
871
	assertSortedResults(
872
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICUNR+"}"
872
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICUNR+"}"
873
	);
873
	);
874
}
874
}
875
875
Lines 885-891 Link Here
885
		"}\n";
885
		"}\n";
886
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "paramMethod(String s");
886
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "paramMethod(String s");
887
	assertSortedResults(
887
	assertSortedResults(
888
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
888
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
889
	);
889
	);
890
}
890
}
891
891
Lines 901-907 Link Here
901
		"}\n";
901
		"}\n";
902
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#paramMethod(String str,");
902
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#paramMethod(String str,");
903
	assertSortedResults(
903
	assertSortedResults(
904
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICENUNRIT+"}"
904
		"paramMethod[JAVADOC_METHOD_REF]{{@link #paramMethod(String, boolean, Object)}, Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICENUNRIT+"}"
905
	);
905
	);
906
}
906
}
907
907
Lines 917-923 Link Here
917
		"}\n";
917
		"}\n";
918
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "paramMethod(String,");
918
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "paramMethod(String,");
919
	assertSortedResults(
919
	assertSortedResults(
920
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
920
		"paramMethod[METHOD_REF]{paramMethod(String, boolean, Object), Ljavadoc.text.BasicTestTextIns;, (Ljava.lang.String;ZLjava.lang.Object;)V, paramMethod, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
921
	);
921
	);
922
}
922
}
923
923
Lines 936-943 Link Here
936
		"}\n";
936
		"}\n";
937
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTest");
937
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTest");
938
	assertSortedResults(
938
	assertSortedResults(
939
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}\n" + 
939
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}\n" + 
940
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE_IT+"}"
940
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINRIT+"}"
941
	);
941
	);
942
}
942
}
943
943
Lines 953-960 Link Here
953
		"}\n";
953
		"}\n";
954
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTest", 3); // 3rd occurence
954
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTest", 3); // 3rd occurence
955
	assertSortedResults(
955
	assertSortedResults(
956
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
956
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
957
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE+"}"
957
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINR+"}"
958
	);
958
	);
959
}
959
}
960
960
Lines 970-977 Link Here
970
		"}\n";
970
		"}\n";
971
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTest", 3); // 3rd occurence
971
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTest", 3); // 3rd occurence
972
	assertSortedResults(
972
	assertSortedResults(
973
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
973
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
974
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE+"}"
974
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINR+"}"
975
	);
975
	);
976
}
976
}
977
977
Lines 993-999 Link Here
993
	};
993
	};
994
	completeInJavadoc(sources, true, "OtherTypes#O");
994
	completeInJavadoc(sources, true, "OtherTypes#O");
995
	assertSortedResults(
995
	assertSortedResults(
996
		"OtherTypes[JAVADOC_METHOD_REF]{{@link OtherTypes#OtherTypes()}, Ljavadoc.text.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE_IT+"}"
996
		"OtherTypes[JAVADOC_METHOD_REF]{{@link OtherTypes#OtherTypes()}, Ljavadoc.text.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINRIT+"}"
997
	);
997
	);
998
}
998
}
999
999
Lines 1014-1020 Link Here
1014
	};
1014
	};
1015
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
1015
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
1016
	assertSortedResults(
1016
	assertSortedResults(
1017
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.text.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE+"}"
1017
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.text.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINR+"}"
1018
	);
1018
	);
1019
}
1019
}
1020
1020
Lines 1030-1048 Link Here
1030
		"}\n";
1030
		"}\n";
1031
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
1031
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
1032
	assertSortedResults(
1032
	assertSortedResults(
1033
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1033
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1034
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1034
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1035
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1035
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1036
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1036
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1037
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1037
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1038
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1038
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1039
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1039
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1040
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1040
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1041
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1041
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1042
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1042
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1043
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1043
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1044
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}\n" + 
1044
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}\n" + 
1045
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1045
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINRIT+"}"
1046
	);
1046
	);
1047
}
1047
}
1048
1048
Lines 1058-1076 Link Here
1058
		"}\n";
1058
		"}\n";
1059
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
1059
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#");
1060
	assertSortedResults(
1060
	assertSortedResults(
1061
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1061
		"clone[JAVADOC_METHOD_REF]{{@link #clone()}, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1062
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1062
		"equals[JAVADOC_METHOD_REF]{{@link #equals(Object)}, Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1063
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1063
		"finalize[JAVADOC_METHOD_REF]{{@link #finalize()}, Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1064
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1064
		"getClass[JAVADOC_METHOD_REF]{{@link #getClass()}, Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1065
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1065
		"hashCode[JAVADOC_METHOD_REF]{{@link #hashCode()}, Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1066
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1066
		"notify[JAVADOC_METHOD_REF]{{@link #notify()}, Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1067
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1067
		"notifyAll[JAVADOC_METHOD_REF]{{@link #notifyAll()}, Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1068
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1068
		"toString[JAVADOC_METHOD_REF]{{@link #toString()}, Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1069
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1069
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long, int)}, Ljava.lang.Object;, (JI)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1070
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1070
		"wait[JAVADOC_METHOD_REF]{{@link #wait(long)}, Ljava.lang.Object;, (J)V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1071
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNSIT+"}\n" + 
1071
		"wait[JAVADOC_METHOD_REF]{{@link #wait()}, Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNSIT+"}\n" + 
1072
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}\n" + 
1072
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}\n" + 
1073
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1073
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINRIT+"}"
1074
	);
1074
	);
1075
}
1075
}
1076
1076
Lines 1086-1104 Link Here
1086
		"}\n";
1086
		"}\n";
1087
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#", 0); // empty token
1087
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#", 0); // empty token
1088
	assertSortedResults(
1088
	assertSortedResults(
1089
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
1089
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
1090
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
1090
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
1091
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
1091
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
1092
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
1092
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
1093
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
1093
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
1094
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
1094
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
1095
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
1095
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
1096
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
1096
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
1097
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
1097
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
1098
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
1098
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
1099
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
1099
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
1100
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
1100
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
1101
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE+"}"
1101
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(), Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINR+"}"
1102
	);
1102
	);
1103
}
1103
}
1104
1104
Lines 1114-1120 Link Here
1114
		"}\n";
1114
		"}\n";
1115
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns(");
1115
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns(");
1116
	assertSortedResults(
1116
	assertSortedResults(
1117
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
1117
		"BasicTestTextIns[METHOD_REF<CONSTRUCTOR>]{BasicTestTextIns(int, float, Class), Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
1118
	);
1118
	);
1119
}
1119
}
1120
1120
Lines 1131-1137 Link Here
1131
		"}\n";
1131
		"}\n";
1132
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#BasicTestTextIns(int,");
1132
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#BasicTestTextIns(int,");
1133
	assertSortedResults(
1133
	assertSortedResults(
1134
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1134
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}"
1135
	);
1135
	);
1136
}
1136
}
1137
1137
Lines 1149-1156 Link Here
1149
		"}\n";
1149
		"}\n";
1150
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#BasicTestTextIns(");
1150
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "BasicTestTextIns#BasicTestTextIns(");
1151
	assertSortedResults(
1151
	assertSortedResults(
1152
			"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}\n" + 
1152
			"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}\n" + 
1153
			"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1153
			"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link BasicTestTextIns#BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINRIT+"}"
1154
	);
1154
	);
1155
}
1155
}
1156
1156
Lines 1166-1172 Link Here
1166
		"}\n";
1166
		"}\n";
1167
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.BasicTestTextIns#BasicTestTextIns(");
1167
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.BasicTestTextIns#BasicTestTextIns(");
1168
	assertSortedResults(
1168
	assertSortedResults(
1169
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link javadoc.text.BasicTestTextIns#BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1169
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link javadoc.text.BasicTestTextIns#BasicTestTextIns()}, Ljavadoc.text.BasicTestTextIns;, ()V, BasicTestTextIns, null, "+this.positions+R_DRINRIT+"}"
1170
	);
1170
	);
1171
}
1171
}
1172
1172
Lines 1183-1189 Link Here
1183
		"}\n";
1183
		"}\n";
1184
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, java.lang.");
1184
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, java.lang.");
1185
	assertSortedResults(
1185
	assertSortedResults(
1186
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1186
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}"
1187
	);
1187
	);
1188
}
1188
}
1189
1189
Lines 1200-1206 Link Here
1200
		"}\n";
1200
		"}\n";
1201
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, java.lang.Cla");
1201
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, java.lang.Cla");
1202
	assertSortedResults(
1202
	assertSortedResults(
1203
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1203
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}"
1204
	);
1204
	);
1205
}
1205
}
1206
1206
Lines 1218-1224 Link Here
1218
		"}\n";
1218
		"}\n";
1219
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, Class");
1219
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "#BasicTestTextIns(int, float, Class");
1220
	assertSortedResults(
1220
	assertSortedResults(
1221
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE_IT+"}"
1221
		"BasicTestTextIns[JAVADOC_METHOD_REF]{{@link #BasicTestTextIns(int, float, Class)}, Ljavadoc.text.BasicTestTextIns;, (IFLjava.lang.Class;)V, BasicTestTextIns, (xxx, real, clazz), "+this.positions+R_DRINRIT+"}"
1222
	);
1222
	);
1223
}
1223
}
1224
1224
(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests.java (-20 / +20 lines)
Lines 66-72 Link Here
66
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
66
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
67
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
67
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
68
68
69
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
69
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
70
	int start1 = str.lastIndexOf("m.b") + "m.".length();
70
	int start1 = str.lastIndexOf("m.b") + "m.".length();
71
	int end1 = start1 + "b".length();
71
	int end1 = start1 + "b".length();
72
	int start2 = str.lastIndexOf("MissingType");
72
	int start2 = str.lastIndexOf("MissingType");
Lines 103-109 Link Here
103
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
103
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
104
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
104
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
105
	
105
	
106
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
106
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
107
	int start1 = str.lastIndexOf("m.b") + "m.".length();
107
	int start1 = str.lastIndexOf("m.b") + "m.".length();
108
	int end1 = start1 + "b".length();
108
	int end1 = start1 + "b".length();
109
	int start2 = str.lastIndexOf("MissingType");
109
	int start2 = str.lastIndexOf("MissingType");
Lines 146-152 Link Here
146
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
146
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
147
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
147
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
148
148
149
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
149
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
150
	int start1 = str.lastIndexOf("m.b") + "m.".length();
150
	int start1 = str.lastIndexOf("m.b") + "m.".length();
151
	int end1 = start1 + "b".length();
151
	int end1 = start1 + "b".length();
152
	int start2 = str.lastIndexOf("MissingType");
152
	int start2 = str.lastIndexOf("MissingType");
Lines 183-190 Link Here
183
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
183
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
184
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
184
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
185
185
186
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_NO_PROBLEMS;
186
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_NO_PROBLEMS;
187
	int relevance2 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
187
	int relevance2 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
188
	int start1 = str.lastIndexOf("m.") + "m.".length();
188
	int start1 = str.lastIndexOf("m.") + "m.".length();
189
	int end1 = start1;
189
	int end1 = start1;
190
	int start2 = str.lastIndexOf("MissingType");
190
	int start2 = str.lastIndexOf("MissingType");
Lines 243-249 Link Here
243
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
243
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
244
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
244
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
245
	
245
	
246
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
246
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
247
	int start1 = str.lastIndexOf("m.b") + "m.".length();
247
	int start1 = str.lastIndexOf("m.b") + "m.".length();
248
	int end1 = start1 + "b".length();
248
	int end1 = start1 + "b".length();
249
	int start2 = str.lastIndexOf("MissingType");
249
	int start2 = str.lastIndexOf("MissingType");
Lines 282-288 Link Here
282
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
282
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
283
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
283
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
284
	
284
	
285
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
285
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
286
	int start1 = str.lastIndexOf("m.b") + "m.".length();
286
	int start1 = str.lastIndexOf("m.b") + "m.".length();
287
	int end1 = start1 + "b".length();
287
	int end1 = start1 + "b".length();
288
	int start2 = str.lastIndexOf("MissingType");
288
	int start2 = str.lastIndexOf("MissingType");
Lines 328-334 Link Here
328
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
328
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
329
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
329
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
330
330
331
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
331
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
332
	int start1 = str.lastIndexOf("m.e") + "m.".length();
332
	int start1 = str.lastIndexOf("m.e") + "m.".length();
333
	int end1 = start1 + "e".length();
333
	int end1 = start1 + "e".length();
334
	assertResults(
334
	assertResults(
Lines 409-415 Link Here
409
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
409
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
410
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
410
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
411
411
412
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
412
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
413
	int start1 = str.lastIndexOf("m.b") + "m.".length();
413
	int start1 = str.lastIndexOf("m.b") + "m.".length();
414
	int end1 = start1 + "b".length();
414
	int end1 = start1 + "b".length();
415
	int start2 = str.lastIndexOf("MissingType");
415
	int start2 = str.lastIndexOf("MissingType");
Lines 450-456 Link Here
450
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
450
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
451
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
451
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
452
452
453
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
453
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
454
	int start1 = str.lastIndexOf("m.b") + "m.".length();
454
	int start1 = str.lastIndexOf("m.b") + "m.".length();
455
	int end1 = start1 + "b".length();
455
	int end1 = start1 + "b".length();
456
	int start2 = str.lastIndexOf("MissingMemberType");
456
	int start2 = str.lastIndexOf("MissingMemberType");
Lines 487-493 Link Here
487
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
487
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
488
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
488
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
489
	
489
	
490
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
490
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
491
	int start1 = str.lastIndexOf("m().b") + "m().".length();
491
	int start1 = str.lastIndexOf("m().b") + "m().".length();
492
	int end1 = start1 + "b".length();
492
	int end1 = start1 + "b".length();
493
	int start2 = str.lastIndexOf("MissingType");
493
	int start2 = str.lastIndexOf("MissingType");
Lines 524-530 Link Here
524
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
524
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
525
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
525
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
526
526
527
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
527
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
528
	int start1 = str.lastIndexOf("m(0).b") + "m(0).".length();
528
	int start1 = str.lastIndexOf("m(0).b") + "m(0).".length();
529
	int end1 = start1 + "b".length();
529
	int end1 = start1 + "b".length();
530
	int start2 = str.lastIndexOf("MissingType");
530
	int start2 = str.lastIndexOf("MissingType");
Lines 570-576 Link Here
570
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
570
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
571
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
571
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
572
572
573
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
573
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
574
	int start1 = str.lastIndexOf("m().e") + "m().".length();
574
	int start1 = str.lastIndexOf("m().e") + "m().".length();
575
	int end1 = start1 + "e".length();
575
	int end1 = start1 + "e".length();
576
	assertResults(
576
	assertResults(
Lines 653-659 Link Here
653
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
653
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
654
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
654
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
655
655
656
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
656
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
657
	int start1 = str.lastIndexOf("m().b") + "m().".length();
657
	int start1 = str.lastIndexOf("m().b") + "m().".length();
658
	int end1 = start1 + "b".length();
658
	int end1 = start1 + "b".length();
659
	int start2 = str.lastIndexOf("MissingType");
659
	int start2 = str.lastIndexOf("MissingType");
Lines 692-698 Link Here
692
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
692
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
693
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
693
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
694
694
695
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
695
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
696
	int start1 = str.lastIndexOf("m.b") + "m.".length();
696
	int start1 = str.lastIndexOf("m.b") + "m.".length();
697
	int end1 = start1 + "b".length();
697
	int end1 = start1 + "b".length();
698
	int start2 = str.lastIndexOf("MissingType");
698
	int start2 = str.lastIndexOf("MissingType");
Lines 797-803 Link Here
797
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
797
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
798
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
798
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
799
799
800
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
800
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
801
	int start1 = str.lastIndexOf("m.e") + "m.".length();
801
	int start1 = str.lastIndexOf("m.e") + "m.".length();
802
	int end1 = start1 + "e".length();
802
	int end1 = start1 + "e".length();
803
	int start2 = str.lastIndexOf("MissingType");
803
	int start2 = str.lastIndexOf("MissingType");
Lines 844-850 Link Here
844
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
844
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
845
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
845
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
846
	
846
	
847
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
847
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
848
		int start1 = str.lastIndexOf("m.b") + "m.".length();
848
		int start1 = str.lastIndexOf("m.b") + "m.".length();
849
		int end1 = start1 + "b".length();
849
		int end1 = start1 + "b".length();
850
		int start2 = str.lastIndexOf("MissingMemberType");
850
		int start2 = str.lastIndexOf("MissingMemberType");
Lines 940-946 Link Here
940
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
940
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
941
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
941
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
942
	
942
	
943
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
943
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
944
		int start1 = str.lastIndexOf("m.b") + "m.".length();
944
		int start1 = str.lastIndexOf("m.b") + "m.".length();
945
		int end1 = start1 + "b".length();
945
		int end1 = start1 + "b".length();
946
		int start2 = str.lastIndexOf("MissingMemberMemberType");
946
		int start2 = str.lastIndexOf("MissingMemberMemberType");
Lines 1035-1041 Link Here
1035
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
1035
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
1036
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1036
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1037
	
1037
	
1038
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
1038
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
1039
		int start1 = str.lastIndexOf("m.b") + "m.".length();
1039
		int start1 = str.lastIndexOf("m.b") + "m.".length();
1040
		int end1 = start1 + "b".length();
1040
		int end1 = start1 + "b".length();
1041
		int start2 = str.lastIndexOf("MissingMemberType");
1041
		int start2 = str.lastIndexOf("MissingMemberType");
Lines 1129-1135 Link Here
1129
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
1129
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
1130
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1130
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1131
	
1131
	
1132
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
1132
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
1133
		int start1 = str.lastIndexOf("m.b") + "m.".length();
1133
		int start1 = str.lastIndexOf("m.b") + "m.".length();
1134
		int end1 = start1 + "b".length();
1134
		int end1 = start1 + "b".length();
1135
		int start2 = str.lastIndexOf("MissingMemberMemberType");
1135
		int start2 = str.lastIndexOf("MissingMemberMemberType");
(-)src/org/eclipse/jdt/core/tests/model/JavadocPackageCompletionModelTest.java (-57 / +57 lines)
Lines 227-233 Link Here
227
		"package javadoc.tags;\n";
227
		"package javadoc.tags;\n";
228
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "Obj");
228
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "Obj");
229
	assertResults(
229
	assertResults(
230
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
230
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
231
	);
231
	);
232
}
232
}
233
233
Lines 240-246 Link Here
240
		"package javadoc.tags;\n";
240
		"package javadoc.tags;\n";
241
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "BasicTestRef");
241
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "BasicTestRef");
242
	assertResults(
242
	assertResults(
243
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICNR+"}"
243
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICNR+"}"
244
	);
244
	);
245
}
245
}
246
246
Lines 254-260 Link Here
254
		"package javadoc.tags;\n";
254
		"package javadoc.tags;\n";
255
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "org.eclipse.jdt.core.tests.BasicTestRef");
255
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "org.eclipse.jdt.core.tests.BasicTestRef");
256
	assertResults(
256
	assertResults(
257
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICQNR+"}"
257
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICQNR+"}"
258
	);
258
	);
259
}
259
}
260
260
Lines 268-275 Link Here
268
		"package javadoc.tags;\n";
268
		"package javadoc.tags;\n";
269
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "java.la");
269
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "java.la");
270
	assertResults(
270
	assertResults(
271
		"java.lang.annotation[PACKAGE_REF]{java.lang.annotation, java.lang.annotation, null, null, null, "+this.positions+R_DICQNR+"}\n" + 
271
		"java.lang.annotation[PACKAGE_REF]{java.lang.annotation, java.lang.annotation, null, null, null, "+this.positions+R_DRICQNR+"}\n" + 
272
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}"
272
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}"
273
	);
273
	);
274
}
274
}
275
275
Lines 282-290 Link Here
282
		"package javadoc.tags;\n";
282
		"package javadoc.tags;\n";
283
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "pack.Bin");
283
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "pack.Bin");
284
	assertSortedResults(
284
	assertSortedResults(
285
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DICQNR+"}\n" + 
285
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
286
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DICQNR+"}\n" + 
286
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
287
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DICQNR+"}"
287
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DRICQNR+"}"
288
	);
288
	);
289
}
289
}
290
290
Lines 298-305 Link Here
298
		"package javadoc.tags;\n";
298
		"package javadoc.tags;\n";
299
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "I");
299
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "I");
300
	assertSortedResults(
300
	assertSortedResults(
301
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICUNR+"}\n" + 
301
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
302
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNR+"}"
302
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNR+"}"
303
	);
303
	);
304
}
304
}
305
305
Lines 326-332 Link Here
326
		"package javadoc.tags;\n";
326
		"package javadoc.tags;\n";
327
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "FIE");
327
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "FIE");
328
	assertResults(
328
	assertResults(
329
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DICNR+"}"
329
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DRICNR+"}"
330
	);
330
	);
331
}
331
}
332
332
Lines 346-352 Link Here
346
	};
346
	};
347
	completeInJavadoc(sources, true, "bar");
347
	completeInJavadoc(sources, true, "bar");
348
	assertResults(
348
	assertResults(
349
		"bar[FIELD_REF]{bar, Ljavadoc.tags.OtherTypes;, I, bar, null, "+this.positions+R_DICENNRNS+"}"
349
		"bar[FIELD_REF]{bar, Ljavadoc.tags.OtherTypes;, I, bar, null, "+this.positions+R_DRICENNRNS+"}"
350
	);
350
	);
351
}
351
}
352
352
Lines 370-388 Link Here
370
		"package javadoc.tags;\n";
370
		"package javadoc.tags;\n";
371
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "#", 0); // empty token
371
	completeInJavadoc("/Completion/src/javadoc/tags/package-info.java", source, true, "#", 0); // empty token
372
	assertResults(
372
	assertResults(
373
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DICNR+"}\n" + 
373
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DRICNR+"}\n" + 
374
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
374
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
375
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
375
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
376
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
376
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
377
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
377
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
378
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
378
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
379
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
379
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
380
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
380
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
381
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
381
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
382
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
382
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
383
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
383
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
384
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
384
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
385
		"BasicTestReferences[METHOD_REF<CONSTRUCTOR>]{BasicTestReferences(), Lorg.eclipse.jdt.core.tests.BasicTestReferences;, ()V, BasicTestReferences, null, "+this.positions+JAVADOC_RELEVANCE+"}"
385
		"BasicTestReferences[METHOD_REF<CONSTRUCTOR>]{BasicTestReferences(), Lorg.eclipse.jdt.core.tests.BasicTestReferences;, ()V, BasicTestReferences, null, "+this.positions+R_DRINR+"}"
386
	);
386
	);
387
}
387
}
388
388
Lines 403-422 Link Here
403
	};
403
	};
404
	completeInJavadoc(sources, true, "#", 0); // empty token
404
	completeInJavadoc(sources, true, "#", 0); // empty token
405
	assertResults(
405
	assertResults(
406
		"obj[FIELD_REF]{obj, Ljavadoc.tags.OtherTypes;, Ljava.lang.Object;, obj, null, "+this.positions+R_DICNRNS+"}\n" + 
406
		"obj[FIELD_REF]{obj, Ljavadoc.tags.OtherTypes;, Ljava.lang.Object;, obj, null, "+this.positions+R_DRICNRNS+"}\n" + 
407
		"foo[FIELD_REF]{foo, Ljavadoc.tags.OtherTypes;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
407
		"foo[FIELD_REF]{foo, Ljavadoc.tags.OtherTypes;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
408
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
408
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
409
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
409
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
410
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
410
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
411
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
411
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
412
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
412
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
413
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
413
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
414
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
414
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
415
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
415
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
416
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
416
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
417
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
417
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
418
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
418
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
419
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE+"}"
419
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINR+"}"
420
	);
420
	);
421
}
421
}
422
422
Lines 439-445 Link Here
439
	};
439
	};
440
	completeInJavadoc(sources, true, "meth");
440
	completeInJavadoc(sources, true, "meth");
441
	assertResults(
441
	assertResults(
442
		"method[METHOD_REF]{method(), Ljavadoc.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
442
		"method[METHOD_REF]{method(), Ljavadoc.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
443
	);
443
	);
444
}
444
}
445
public void test031() throws JavaModelException {
445
public void test031() throws JavaModelException {
Lines 459-478 Link Here
459
	};
459
	};
460
	completeInJavadoc(sources, true, "#", 0); // empty token
460
	completeInJavadoc(sources, true, "#", 0); // empty token
461
	assertResults(
461
	assertResults(
462
		"method[METHOD_REF]{method(), Ljavadoc.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DICNRNS+"}\n" + 
462
		"method[METHOD_REF]{method(), Ljavadoc.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DRICNRNS+"}\n" + 
463
		"foo[METHOD_REF]{foo(), Ljavadoc.tags.OtherTypes;, ()V, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
463
		"foo[METHOD_REF]{foo(), Ljavadoc.tags.OtherTypes;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
464
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
464
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
465
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
465
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
466
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
466
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
467
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
467
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
468
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
468
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
469
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
469
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
470
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
470
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
471
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
471
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
472
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
472
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
473
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
473
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
474
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
474
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
475
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE+"}"
475
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINR+"}"
476
	);
476
	);
477
}
477
}
478
478
Lines 496-502 Link Here
496
	};
496
	};
497
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
497
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
498
	assertResults(
498
	assertResults(
499
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE+"}"
499
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINR+"}"
500
	);
500
	);
501
}
501
}
502
public void test041() throws JavaModelException {
502
public void test041() throws JavaModelException {
Lines 516-523 Link Here
516
	};
516
	};
517
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
517
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
518
	assertResults(
518
	assertResults(
519
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(Object, String), Ljavadoc.tags.OtherTypes;, (Ljava.lang.Object;Ljava.lang.String;)V, OtherTypes, (obj, str), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
519
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(Object, String), Ljavadoc.tags.OtherTypes;, (Ljava.lang.Object;Ljava.lang.String;)V, OtherTypes, (obj, str), "+this.positions+R_DRINR+"}\n" + 
520
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(int), Ljavadoc.tags.OtherTypes;, (I)V, OtherTypes, (x), "+this.positions+JAVADOC_RELEVANCE+"}"
520
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(int), Ljavadoc.tags.OtherTypes;, (I)V, OtherTypes, (x), "+this.positions+R_DRINR+"}"
521
	);
521
	);
522
}
522
}
523
}
523
}
(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests2.java (-2 / +2 lines)
Lines 143-149 Link Here
143
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
143
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
144
		cu.codeComplete(cursorLocation, requestor);
144
		cu.codeComplete(cursorLocation, requestor);
145
		
145
		
146
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
146
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
147
		int start1 = str.lastIndexOf("x.fo") + "x.".length();
147
		int start1 = str.lastIndexOf("x.fo") + "x.".length();
148
		int end1 = start1 + "fo".length();
148
		int end1 = start1 + "fo".length();
149
		int start2 = str.lastIndexOf("XX");
149
		int start2 = str.lastIndexOf("XX");
Lines 237-243 Link Here
237
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
237
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
238
		cu.codeComplete(cursorLocation, requestor);
238
		cu.codeComplete(cursorLocation, requestor);
239
		
239
		
240
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
240
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
241
		int start1 = str.lastIndexOf("x.fo") + "x.".length();
241
		int start1 = str.lastIndexOf("x.fo") + "x.".length();
242
		int end1 = start1 + "fo".length();
242
		int end1 = start1 + "fo".length();
243
		int start2 = str.lastIndexOf("XX");
243
		int start2 = str.lastIndexOf("XX");
(-)src/org/eclipse/jdt/core/tests/model/JavadocMethodCompletionModelTest.java (-220 / +220 lines)
Lines 217-225 Link Here
217
		"}\n";
217
		"}\n";
218
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethodsE");
218
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethodsE");
219
	assertSortedResults(
219
	assertSortedResults(
220
		"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DICUNR+"}\n" + 
220
		"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
221
		"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DICUNR+"}\n" + 
221
		"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
222
		"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DICUNR+"}"
222
		"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DRICUNR+"}"
223
	);
223
	);
224
}
224
}
225
225
Lines 243-252 Link Here
243
		assertResults("");
243
		assertResults("");
244
	} else {
244
	} else {
245
		assertResults(
245
		assertResults(
246
			"BasicTestMethods[TYPE_REF]{BasicTestMethods, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethods;, null, null, "+this.positions+R_DICUNR+"}\n" + 
246
			"BasicTestMethods[TYPE_REF]{BasicTestMethods, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethods;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
247
			"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DICUNR+"}\n" + 
247
			"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
248
			"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DICUNR+"}\n" + 
248
			"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
249
			"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DICUNR+"}");
249
			"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DRICUNR+"}");
250
	}
250
	}
251
}
251
}
252
252
Lines 267-275 Link Here
267
		"}\n";
267
		"}\n";
268
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethodsE");
268
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethodsE");
269
	assertSortedResults(
269
	assertSortedResults(
270
		"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DICUNRE+"}\n" + 
270
		"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DRICUNRE+"}\n" + 
271
		"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DICUNRE+"}\n" + 
271
		"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DRICUNRE+"}\n" + 
272
		"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DICUNR+"}"
272
		"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DRICUNR+"}"
273
	);
273
	);
274
}
274
}
275
275
Lines 290-298 Link Here
290
		"}\n";
290
		"}\n";
291
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethodsE");
291
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethodsE");
292
	assertSortedResults(
292
	assertSortedResults(
293
		"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DICUNREEET+"}\n" + 
293
		"BasicTestMethodsException2[TYPE_REF]{BasicTestMethodsException2, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException2;, null, null, "+this.positions+R_DRICUNREEET+"}\n" + 
294
		"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DICUNRE+"}\n" + 
294
		"BasicTestMethodsException1[TYPE_REF]{BasicTestMethodsException1, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException1;, null, null, "+this.positions+R_DRICUNRE+"}\n" + 
295
		"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DICUNR+"}"
295
		"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DRICUNR+"}"
296
	);
296
	);
297
}
297
}
298
298
Lines 313-325 Link Here
313
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "@throws ", 0); // completion on empty token
313
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "@throws ", 0); // completion on empty token
314
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
314
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
315
		assertResults(
315
		assertResults(
316
			"BasicTestMethodsException[TYPE_REF]{BasicTestMethodsException, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException;, null, null, "+this.positions+R_DICUNREET+"}"
316
			"BasicTestMethodsException[TYPE_REF]{BasicTestMethodsException, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException;, null, null, "+this.positions+R_DRICUNREET+"}"
317
		);
317
		);
318
	} else {
318
	} else {
319
		assertResults(
319
		assertResults(
320
			"BasicTestMethods[TYPE_REF]{BasicTestMethods, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethods;, null, null, "+this.positions+R_DICUNR+"}\n" + 
320
			"BasicTestMethods[TYPE_REF]{BasicTestMethods, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethods;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
321
			"BasicTestMethodsException[TYPE_REF]{BasicTestMethodsException, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException;, null, null, "+this.positions+R_DICUNREEET+"}\n" + 
321
			"BasicTestMethodsException[TYPE_REF]{BasicTestMethodsException, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsException;, null, null, "+this.positions+R_DRICUNREEET+"}\n" + 
322
			"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DICUNR+"}");
322
			"BasicTestMethodsExample[TYPE_REF]{BasicTestMethodsExample, javadoc.methods.tags, Ljavadoc.methods.tags.BasicTestMethodsExample;, null, null, "+this.positions+R_DRICUNR+"}");
323
	}
323
	}
324
}
324
}
325
325
Lines 338-345 Link Here
338
		"}\n";
338
		"}\n";
339
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "I");
339
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "I");
340
	assertResults(
340
	assertResults(
341
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICUNRE+"}\n" + 
341
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICUNRE+"}\n" + 
342
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNRE+"}"
342
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNRE+"}"
343
	);
343
	);
344
}
344
}
345
345
Lines 357-364 Link Here
357
		"}\n";
357
		"}\n";
358
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.I");
358
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.I");
359
	assertResults(
359
	assertResults(
360
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNRE+"}\n" + 
360
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNRE+"}\n" + 
361
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNREEET+"}"
361
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNREEET+"}"
362
	);
362
	);
363
}
363
}
364
364
Lines 378-385 Link Here
378
		"}";
378
		"}";
379
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
379
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
380
	assertResults(
380
	assertResults(
381
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.BasicTestMethods;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
381
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.BasicTestMethods;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
382
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DICNRNS+"}"
382
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}"
383
	);
383
	);
384
}
384
}
385
385
Lines 396-403 Link Here
396
		"}";
396
		"}";
397
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
397
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
398
	assertResults(
398
	assertResults(
399
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.BasicTestMethods;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
399
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.BasicTestMethods;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
400
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DICNRNS+"}"
400
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}"
401
	);
401
	);
402
}
402
}
403
403
Lines 414-421 Link Here
414
		"}";
414
		"}";
415
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
415
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
416
	assertResults(
416
	assertResults(
417
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.BasicTestMethods;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
417
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.BasicTestMethods;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
418
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DICNRNS+"}"
418
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}"
419
	);
419
	);
420
}
420
}
421
421
Lines 439-446 Link Here
439
	};
439
	};
440
	completeInJavadoc(sources, true, "fo");
440
	completeInJavadoc(sources, true, "fo");
441
	assertResults(
441
	assertResults(
442
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.OtherFields;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
442
		"foo[FIELD_REF]{foo, Ljavadoc.methods.tags.OtherFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
443
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.OtherFields;, ()V, foo, null, "+this.positions+R_DICNRNS+"}"
443
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.OtherFields;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}"
444
	);
444
	);
445
}
445
}
446
446
Lines 476-482 Link Here
476
		"}\n";
476
		"}\n";
477
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
477
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fo");
478
	assertResults(
478
	assertResults(
479
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>()V, foo, null, "+this.positions+R_DICNRNS+"}"
479
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>()V, foo, null, "+this.positions+R_DRICNRNS+"}"
480
	);
480
	);
481
}
481
}
482
482
Lines 497-503 Link Here
497
		"}\n";
497
		"}\n";
498
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
498
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
499
	assertResults(
499
	assertResults(
500
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICNRNS+"}"
500
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICNRNS+"}"
501
	);
501
	);
502
}
502
}
503
503
Lines 519-525 Link Here
519
		"}\n";
519
		"}\n";
520
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
520
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
521
	assertResults(
521
	assertResults(
522
		"bar[METHOD_REF]{bar(String, Class, Class), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;U:Ljava.lang.Object;>(Ljava.lang.String;Ljava.lang.Class<TT;>;Ljava.lang.Class<TU;>;)V, bar, (str, clt, clu), "+this.positions+R_DICNRNS+"}"
522
		"bar[METHOD_REF]{bar(String, Class, Class), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;U:Ljava.lang.Object;>(Ljava.lang.String;Ljava.lang.Class<TT;>;Ljava.lang.Class<TU;>;)V, bar, (str, clt, clu), "+this.positions+R_DRICNRNS+"}"
523
	);
523
	);
524
}
524
}
525
525
Lines 540-546 Link Here
540
		"}\n";
540
		"}\n";
541
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
541
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
542
	assertResults(
542
	assertResults(
543
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICNRNS+"}"
543
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICNRNS+"}"
544
	);
544
	);
545
}
545
}
546
546
Lines 561-567 Link Here
561
		"}\n";
561
		"}\n";
562
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
562
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "ba");
563
	assertResults(
563
	assertResults(
564
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICNRNS+"}"
564
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICNRNS+"}"
565
	);
565
	);
566
}
566
}
567
567
Lines 584-590 Link Here
584
	};
584
	};
585
	completeInJavadoc(sources, true, "fo");
585
	completeInJavadoc(sources, true, "fo");
586
	assertResults(
586
	assertResults(
587
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.OtherTypes;, ()V, foo, null, "+this.positions+R_DICNRNS+"}"
587
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.OtherTypes;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}"
588
	);
588
	);
589
}
589
}
590
590
Lines 601-620 Link Here
601
		"}\n";
601
		"}\n";
602
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
602
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
603
	assertResults(
603
	assertResults(
604
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
604
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
605
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
605
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
606
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
606
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
607
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
607
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
608
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
608
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
609
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
609
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
610
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
610
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
611
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
611
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
612
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
612
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
613
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
613
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
614
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
614
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
615
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
615
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
616
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
616
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
617
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
617
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
618
	);
618
	);
619
}
619
}
620
620
Lines 632-651 Link Here
632
		"}\n";
632
		"}\n";
633
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
633
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
634
	assertResults(
634
	assertResults(
635
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>()V, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
635
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>()V, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
636
		"bar[METHOD_REF]{bar(Object, Object), Ljavadoc.methods.tags.BasicTestMethods;, <TParam1:Ljava.lang.Object;TParam2:Ljava.lang.Object;>(TTParam1;TTParam2;)V, bar, (tp1, tp2), "+this.positions+R_DICNRNS+"}\n" + 
636
		"bar[METHOD_REF]{bar(Object, Object), Ljavadoc.methods.tags.BasicTestMethods;, <TParam1:Ljava.lang.Object;TParam2:Ljava.lang.Object;>(TTParam1;TTParam2;)V, bar, (tp1, tp2), "+this.positions+R_DRICNRNS+"}\n" + 
637
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
637
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
638
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
638
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
639
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
639
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
640
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
640
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
641
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
641
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
642
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
642
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
643
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
643
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
644
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
644
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
645
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
645
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
646
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
646
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
647
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
647
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
648
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
648
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
649
	);
649
	);
650
}
650
}
651
651
Lines 662-681 Link Here
662
		"}\n";
662
		"}\n";
663
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
663
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
664
	assertResults(
664
	assertResults(
665
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
665
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
666
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
666
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
667
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
667
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
668
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
668
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
669
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
669
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
670
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
670
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
671
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
671
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
672
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
672
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
673
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
673
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
674
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
674
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
675
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
675
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
676
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
676
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
677
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
677
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
678
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
678
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
679
	);
679
	);
680
}
680
}
681
681
Lines 692-711 Link Here
692
		"}\n";
692
		"}\n";
693
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
693
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // completion on empty token
694
	assertResults(
694
	assertResults(
695
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
695
		"foo[METHOD_REF]{foo(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
696
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
696
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
697
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
697
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
698
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
698
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
699
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
699
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
700
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
700
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
701
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
701
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
702
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
702
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
703
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
703
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
704
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
704
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
705
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
705
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
706
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
706
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
707
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
707
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
708
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
708
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
709
	);
709
	);
710
}
710
}
711
711
Lines 722-728 Link Here
722
		"}\n";
722
		"}\n";
723
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(");
723
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(");
724
	assertResults(
724
	assertResults(
725
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
725
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
726
	);
726
	);
727
}
727
}
728
728
Lines 739-745 Link Here
739
		"}\n";
739
		"}\n";
740
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Str");
740
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Str");
741
	assertResults(
741
	assertResults(
742
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICUNR+"}"
742
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICUNR+"}"
743
	);
743
	);
744
}
744
}
745
745
Lines 756-771 Link Here
756
		"}\n";
756
		"}\n";
757
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.");
757
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.");
758
	assertSortedResults(
758
	assertSortedResults(
759
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICNR+"}\n" + 
759
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICNR+"}\n" + 
760
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
760
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
761
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DICNR+"}\n" + 
761
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DRICNR+"}\n" + 
762
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DICNR+"}\n" + 
762
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DRICNR+"}\n" + 
763
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNR+"}\n" + 
763
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
764
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
764
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
765
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICNR+"}\n" + 
765
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICNR+"}\n" + 
766
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DICNR+"}\n" + 
766
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
767
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICNR+"}\n" + 
767
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICNR+"}\n" + 
768
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DICNR+"}"
768
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DRICNR+"}"
769
	);
769
	);
770
}
770
}
771
771
Lines 782-788 Link Here
782
		"}\n";
782
		"}\n";
783
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.St");
783
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.St");
784
	assertResults(
784
	assertResults(
785
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICNR+"}"
785
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICNR+"}"
786
	);
786
	);
787
}
787
}
788
788
Lines 799-805 Link Here
799
		"}\n";
799
		"}\n";
800
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String s");
800
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String s");
801
	assertResults(
801
	assertResults(
802
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
802
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
803
	);
803
	);
804
}
804
}
805
805
Lines 817-823 Link Here
817
		"}\n";
817
		"}\n";
818
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str,");
818
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str,");
819
	assertResults(
819
	assertResults(
820
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
820
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
821
	);
821
	);
822
}
822
}
823
823
Lines 834-840 Link Here
834
		"}\n";
834
		"}\n";
835
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str, ");
835
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str, ");
836
	assertResults(
836
	assertResults(
837
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
837
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
838
	);
838
	);
839
}
839
}
840
840
Lines 851-857 Link Here
851
		"}\n";
851
		"}\n";
852
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String,");
852
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String,");
853
	assertResults(
853
	assertResults(
854
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
854
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
855
	);
855
	);
856
}
856
}
857
857
Lines 868-874 Link Here
868
		"}\n";
868
		"}\n";
869
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bool");
869
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bool");
870
	assertResults(
870
	assertResults(
871
		"boolean[KEYWORD]{boolean, null, null, boolean, null, "+this.positions+R_DICNR+"}"
871
		"boolean[KEYWORD]{boolean, null, null, boolean, null, "+this.positions+R_DRICNR+"}"
872
	);
872
	);
873
}
873
}
874
874
Lines 903-909 Link Here
903
		"}\n";
903
		"}\n";
904
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str, boolean flag,");
904
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str, boolean flag,");
905
	assertResults(
905
	assertResults(
906
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
906
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
907
	);
907
	);
908
}
908
}
909
909
Lines 920-926 Link Here
920
		"}\n";
920
		"}\n";
921
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String,boolean,");
921
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String,boolean,");
922
	assertResults(
922
	assertResults(
923
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
923
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
924
	);
924
	);
925
}
925
}
926
926
Lines 937-943 Link Here
937
		"}\n";
937
		"}\n";
938
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Object");
938
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Object");
939
	assertResults(
939
	assertResults(
940
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICENUNR+"}"
940
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICENUNR+"}"
941
	);
941
	);
942
}
942
}
943
943
Lines 972-978 Link Here
972
		"}\n";
972
		"}\n";
973
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str, boolean flag, Object o");
973
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "bar(String str, boolean flag, Object o");
974
	assertResults(
974
	assertResults(
975
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DICENUNR+"}"
975
		"bar[METHOD_REF]{bar(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, bar, (str, flag, obj), "+this.positions+R_DRICENUNR+"}"
976
	);
976
	);
977
}
977
}
978
978
Lines 995-1001 Link Here
995
	};
995
	};
996
	completeInJavadoc(sources, true, "foo(");
996
	completeInJavadoc(sources, true, "foo(");
997
	assertResults(
997
	assertResults(
998
		"foo[METHOD_REF]{foo(String), Ljavadoc.methods.tags.OtherTypes;, (Ljava.lang.String;)V, foo, (str), "+this.positions+R_DICENUNR+"}"
998
		"foo[METHOD_REF]{foo(String), Ljavadoc.methods.tags.OtherTypes;, (Ljava.lang.String;)V, foo, (str), "+this.positions+R_DRICENUNR+"}"
999
	);
999
	);
1000
}
1000
}
1001
1001
Lines 1018-1024 Link Here
1018
	};
1018
	};
1019
	completeInJavadoc(sources, true, "foo(");
1019
	completeInJavadoc(sources, true, "foo(");
1020
	assertResults(
1020
	assertResults(
1021
		"foo[METHOD_REF]{foo(String), Ljavadoc.methods.tags.OtherTypes;, (Ljava.lang.String;)V, foo, (str), "+this.positions+R_DICENUNR+"}"
1021
		"foo[METHOD_REF]{foo(String), Ljavadoc.methods.tags.OtherTypes;, (Ljava.lang.String;)V, foo, (str), "+this.positions+R_DRICENUNR+"}"
1022
	);
1022
	);
1023
}
1023
}
1024
1024
Lines 1035-1041 Link Here
1035
		"}\n";
1035
		"}\n";
1036
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1036
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1037
	assertResults(
1037
	assertResults(
1038
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
1038
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
1039
	);
1039
	);
1040
}
1040
}
1041
1041
Lines 1052-1059 Link Here
1052
		"}\n";
1052
		"}\n";
1053
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1053
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1054
	assertResults(
1054
	assertResults(
1055
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
1055
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
1056
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
1056
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
1057
	);
1057
	);
1058
}
1058
}
1059
1059
Lines 1070-1077 Link Here
1070
		"}\n";
1070
		"}\n";
1071
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1071
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1072
	assertResults(
1072
	assertResults(
1073
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), "+this.positions+R_DICNRNS+"}\n" + 
1073
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), "+this.positions+R_DRICNRNS+"}\n" + 
1074
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
1074
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
1075
	);
1075
	);
1076
}
1076
}
1077
1077
Lines 1088-1095 Link Here
1088
		"}\n";
1088
		"}\n";
1089
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1089
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1090
	assertResults(
1090
	assertResults(
1091
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), [116, 145], "+R_DICNRNS+"}\n" + 
1091
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), [116, 145], "+R_DRICNRNS+"}\n" + 
1092
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, [116, 145], "+R_DICNRNS+"}"
1092
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, [116, 145], "+R_DRICNRNS+"}"
1093
	);
1093
	);
1094
}
1094
}
1095
1095
Lines 1107-1114 Link Here
1107
		"}\n";
1107
		"}\n";
1108
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1108
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "meth", 2); // 2nd occurrence
1109
	assertResults(
1109
	assertResults(
1110
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), "+this.positions+R_DICUNR+"}\n" + 
1110
		"method[METHOD_REF]{method(String, boolean, Object), Ljavadoc.methods.tags.BasicTestMethods;, (Ljava.lang.String;ZLjava.lang.Object;)V, method, (str, flag, obj), "+this.positions+R_DRICUNR+"}\n" + 
1111
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DICUNR+"}"
1111
		"method[METHOD_REF]{method(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, method, null, "+this.positions+R_DRICUNR+"}"
1112
	);
1112
	);
1113
}
1113
}
1114
1114
Lines 1942-1949 Link Here
1942
		"}\n";
1942
		"}\n";
1943
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 2); // 2nd occurence
1943
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 2); // 2nd occurence
1944
	assertResults(
1944
	assertResults(
1945
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
1945
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
1946
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
1946
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
1947
	);
1947
	);
1948
}
1948
}
1949
1949
Lines 1961-1968 Link Here
1961
		"}\n";
1961
		"}\n";
1962
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 2); // 2nd occurence
1962
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 2); // 2nd occurence
1963
	assertResults(
1963
	assertResults(
1964
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
1964
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
1965
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
1965
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
1966
	);
1966
	);
1967
}
1967
}
1968
1968
Lines 1980-1987 Link Here
1980
		"}\n";
1980
		"}\n";
1981
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 2); // 2nd occurence
1981
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 2); // 2nd occurence
1982
	assertResults(
1982
	assertResults(
1983
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>(IFLjava.lang.Class<TT;>;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
1983
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>(IFLjava.lang.Class<TT;>;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
1984
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
1984
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
1985
	);
1985
	);
1986
}
1986
}
1987
1987
Lines 1998-2005 Link Here
1998
		"}\n";
1998
		"}\n";
1999
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 3); // 3rd occurence
1999
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 3); // 3rd occurence
2000
	assertResults(
2000
	assertResults(
2001
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
2001
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
2002
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2002
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2003
	);
2003
	);
2004
}
2004
}
2005
2005
Lines 2016-2023 Link Here
2016
		"}\n";
2016
		"}\n";
2017
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 3); // 3rd occurence
2017
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTest", 3); // 3rd occurence
2018
	assertResults(
2018
	assertResults(
2019
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
2019
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
2020
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2020
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2021
	);
2021
	);
2022
}
2022
}
2023
2023
Lines 2040-2046 Link Here
2040
	};
2040
	};
2041
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
2041
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
2042
	assertResults(
2042
	assertResults(
2043
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.methods.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2043
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.methods.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINR+"}"
2044
	);
2044
	);
2045
}
2045
}
2046
2046
Lines 2062-2068 Link Here
2062
	};
2062
	};
2063
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
2063
	completeInJavadoc(sources, true, "O", 2); // 2nd occurence
2064
	assertResults(
2064
	assertResults(
2065
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.methods.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2065
		"OtherTypes[METHOD_REF<CONSTRUCTOR>]{OtherTypes(), Ljavadoc.methods.tags.OtherTypes;, ()V, OtherTypes, null, "+this.positions+R_DRINR+"}"
2066
	);
2066
	);
2067
}
2067
}
2068
2068
Lines 2079-2097 Link Here
2079
		"}\n";
2079
		"}\n";
2080
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2080
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2081
	assertResults(
2081
	assertResults(
2082
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
2082
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
2083
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
2083
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
2084
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
2084
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
2085
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
2085
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
2086
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
2086
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
2087
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
2087
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
2088
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
2088
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
2089
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
2089
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
2090
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
2090
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
2091
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
2091
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
2092
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
2092
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
2093
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
2093
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
2094
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2094
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2095
	);
2095
	);
2096
}
2096
}
2097
2097
Lines 2109-2127 Link Here
2109
		"}\n";
2109
		"}\n";
2110
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2110
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2111
	assertResults(
2111
	assertResults(
2112
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
2112
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
2113
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
2113
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
2114
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
2114
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
2115
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
2115
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
2116
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
2116
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
2117
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
2117
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
2118
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
2118
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
2119
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
2119
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
2120
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
2120
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
2121
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
2121
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
2122
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
2122
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
2123
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
2123
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
2124
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2124
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2125
	);
2125
	);
2126
}
2126
}
2127
2127
Lines 2139-2157 Link Here
2139
		"}\n";
2139
		"}\n";
2140
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2140
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2141
	assertResults(
2141
	assertResults(
2142
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
2142
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
2143
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
2143
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
2144
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
2144
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
2145
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
2145
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
2146
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
2146
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
2147
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
2147
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
2148
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
2148
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
2149
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
2149
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
2150
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
2150
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
2151
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
2151
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
2152
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
2152
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
2153
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, Class, Class), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;U:Ljava.lang.Object;>(ILjava.lang.Class<TT;>;Ljava.lang.Class<TU;>;)V, BasicTestMethods, (xxx, cl1, cl2), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
2153
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, Class, Class), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;U:Ljava.lang.Object;>(ILjava.lang.Class<TT;>;Ljava.lang.Class<TU;>;)V, BasicTestMethods, (xxx, cl1, cl2), "+this.positions+R_DRINR+"}\n" + 
2154
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2154
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, <T:Ljava.lang.Object;>()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2155
	);
2155
	);
2156
}
2156
}
2157
2157
Lines 2166-2183 Link Here
2166
		"}\n";
2166
		"}\n";
2167
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2167
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "#", 0); // empty token
2168
	assertResults(
2168
	assertResults(
2169
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
2169
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
2170
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
2170
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
2171
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
2171
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
2172
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
2172
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
2173
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
2173
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
2174
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
2174
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
2175
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
2175
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
2176
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
2176
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
2177
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
2177
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
2178
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
2178
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
2179
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
2179
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
2180
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2180
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2181
	);
2181
	);
2182
}
2182
}
2183
2183
Lines 2194-2200 Link Here
2194
		"}\n";
2194
		"}\n";
2195
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2195
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2196
	assertResults(
2196
	assertResults(
2197
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2197
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2198
	);
2198
	);
2199
}
2199
}
2200
2200
Lines 2212-2218 Link Here
2212
		"}\n";
2212
		"}\n";
2213
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2213
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2214
	assertResults(
2214
	assertResults(
2215
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2215
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2216
	);
2216
	);
2217
}
2217
}
2218
2218
Lines 2229-2235 Link Here
2229
		"}\n";
2229
		"}\n";
2230
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2230
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2231
	assertResults(
2231
	assertResults(
2232
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2232
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2233
	);
2233
	);
2234
}
2234
}
2235
2235
Lines 2246-2252 Link Here
2246
		"}\n";
2246
		"}\n";
2247
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2247
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2248
	assertResults(
2248
	assertResults(
2249
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2249
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2250
	);
2250
	);
2251
}
2251
}
2252
2252
Lines 2263-2269 Link Here
2263
		"}\n";
2263
		"}\n";
2264
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2264
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2265
	assertResults(
2265
	assertResults(
2266
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2266
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2267
	);
2267
	);
2268
}
2268
}
2269
2269
Lines 2280-2286 Link Here
2280
		"}\n";
2280
		"}\n";
2281
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2281
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2282
	assertResults(
2282
	assertResults(
2283
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2283
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2284
	);
2284
	);
2285
}
2285
}
2286
2286
Lines 2297-2303 Link Here
2297
		"}\n";
2297
		"}\n";
2298
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2298
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2299
	assertResults(
2299
	assertResults(
2300
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2300
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2301
	);
2301
	);
2302
}
2302
}
2303
2303
Lines 2315-2322 Link Here
2315
		"}\n";
2315
		"}\n";
2316
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2316
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2317
	assertResults(
2317
	assertResults(
2318
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}\n" + 
2318
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}\n" + 
2319
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2319
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2320
	);
2320
	);
2321
}
2321
}
2322
2322
Lines 2332-2338 Link Here
2332
		"}\n";
2332
		"}\n";
2333
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2333
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMethods(");
2334
	assertResults(
2334
	assertResults(
2335
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+JAVADOC_RELEVANCE+"}"
2335
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(), Ljavadoc.methods.tags.BasicTestMethods;, ()V, BasicTestMethods, null, "+this.positions+R_DRINR+"}"
2336
	);
2336
	);
2337
}
2337
}
2338
2338
Lines 2350-2357 Link Here
2350
		"}\n";
2350
		"}\n";
2351
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "in");
2351
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "in");
2352
	assertResults(
2352
	assertResults(
2353
		"int[KEYWORD]{int, null, null, int, null, "+this.positions+R_DICNR+"}\n" + 
2353
		"int[KEYWORD]{int, null, null, int, null, "+this.positions+R_DRICNR+"}\n" + 
2354
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DIUNR+"}"
2354
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRIUNR+"}"
2355
	);
2355
	);
2356
}
2356
}
2357
2357
Lines 2369-2376 Link Here
2369
		"}\n";
2369
		"}\n";
2370
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "int");
2370
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "int");
2371
	assertResults(
2371
	assertResults(
2372
		"int[KEYWORD]{int, null, null, int, null, "+this.positions+R_DICENNR+"}\n" + 
2372
		"int[KEYWORD]{int, null, null, int, null, "+this.positions+R_DRICENNR+"}\n" + 
2373
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DIUNR+"}"
2373
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRIUNR+"}"
2374
	);
2374
	);
2375
}
2375
}
2376
2376
Lines 2387-2393 Link Here
2387
		"}\n";
2387
		"}\n";
2388
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fl");
2388
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "fl");
2389
	assertResults(
2389
	assertResults(
2390
		"float[KEYWORD]{float, null, null, float, null, "+this.positions+R_DICNR+"}"
2390
		"float[KEYWORD]{float, null, null, float, null, "+this.positions+R_DRICNR+"}"
2391
	);
2391
	);
2392
}
2392
}
2393
2393
Lines 2404-2410 Link Here
2404
		"}\n";
2404
		"}\n";
2405
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "float");
2405
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "float");
2406
	assertResults(
2406
	assertResults(
2407
		"float[KEYWORD]{float, null, null, float, null, "+this.positions+R_DICENNR+"}"
2407
		"float[KEYWORD]{float, null, null, float, null, "+this.positions+R_DRICENNR+"}"
2408
	);
2408
	);
2409
}
2409
}
2410
2410
Lines 2421-2427 Link Here
2421
		"}\n";
2421
		"}\n";
2422
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Cla");
2422
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Cla");
2423
	assertResults(
2423
	assertResults(
2424
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICUNR+"}"
2424
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICUNR+"}"
2425
	);
2425
	);
2426
}
2426
}
2427
2427
Lines 2439-2454 Link Here
2439
		"}\n";
2439
		"}\n";
2440
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.");
2440
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.");
2441
	assertSortedResults(
2441
	assertSortedResults(
2442
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICNR+"}\n" + 
2442
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2443
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
2443
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2444
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DICNR+"}\n" + 
2444
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2445
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DICNR+"}\n" + 
2445
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2446
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNR+"}\n" + 
2446
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2447
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
2447
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2448
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICNR+"}\n" + 
2448
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2449
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DICNR+"}\n" + 
2449
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2450
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICNR+"}\n" + 
2450
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICNR+"}\n" + 
2451
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DICNR+"}"
2451
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DRICNR+"}"
2452
	);
2452
	);
2453
}
2453
}
2454
2454
Lines 2465-2471 Link Here
2465
		"}\n";
2465
		"}\n";
2466
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.Cla");
2466
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "java.lang.Cla");
2467
	assertResults(
2467
	assertResults(
2468
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICNR+"}"
2468
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICNR+"}"
2469
	);
2469
	);
2470
}
2470
}
2471
2471
Lines 2483-2489 Link Here
2483
		"}\n";
2483
		"}\n";
2484
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Class");
2484
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "Class");
2485
	assertResults(
2485
	assertResults(
2486
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICENUNR+"}"
2486
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICENUNR+"}"
2487
	);
2487
	);
2488
}
2488
}
2489
/**
2489
/**
Lines 2509-2515 Link Here
2509
			"}\n";
2509
			"}\n";
2510
		completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BTM");
2510
		completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BTM");
2511
		assertResults(
2511
		assertResults(
2512
			"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+JAVADOC_RELEVANCE+"}"
2512
			"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(int, float, Class), Ljavadoc.methods.tags.BasicTestMethods;, (IFLjava.lang.Class;)V, BasicTestMethods, (xxx, real, clazz), "+this.positions+R_DRINR+"}"
2513
		);
2513
		);
2514
	} finally {
2514
	} finally {
2515
		JavaCore.setOptions(oldOptions);
2515
		JavaCore.setOptions(oldOptions);
Lines 2535-2541 Link Here
2535
			"}\n";
2535
			"}\n";
2536
		completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "oTT");
2536
		completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "oTT");
2537
		assertResults(
2537
		assertResults(
2538
			"oneTwoThree[METHOD_REF]{oneTwoThree(int), Ljavadoc.methods.tags.BasicTestMethods;, (I)V, oneTwoThree, (i), "+this.positions+"24}"
2538
			"oneTwoThree[METHOD_REF]{oneTwoThree(int), Ljavadoc.methods.tags.BasicTestMethods;, (I)V, oneTwoThree, (i), "+this.positions+"25}"
2539
		);
2539
		);
2540
	} finally {
2540
	} finally {
2541
		JavaCore.setOptions(oldOptions);
2541
		JavaCore.setOptions(oldOptions);
Lines 2558-2564 Link Here
2558
		"}\n";
2558
		"}\n";
2559
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "oneTwoT", 2);
2559
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "oneTwoT", 2);
2560
	assertResults(
2560
	assertResults(
2561
		"oneTwoThree[METHOD_REF]{oneTwoThree(Object...), Ljavadoc.methods.tags.BasicTestMethods;, ([Ljava.lang.Object;)V, oneTwoThree, (o), "+this.positions+R_DICNRNS+"}"
2561
		"oneTwoThree[METHOD_REF]{oneTwoThree(Object...), Ljavadoc.methods.tags.BasicTestMethods;, ([Ljava.lang.Object;)V, oneTwoThree, (o), "+this.positions+R_DRICNRNS+"}"
2562
	);
2562
	);
2563
}
2563
}
2564
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=155824
2564
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=155824
Lines 2578-2584 Link Here
2578
		"}\n";
2578
		"}\n";
2579
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMeth", 3);
2579
	completeInJavadoc("/Completion/src/javadoc/methods/tags/BasicTestMethods.java", source, true, "BasicTestMeth", 3);
2580
	assertResults(
2580
	assertResults(
2581
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(Object...), Ljavadoc.methods.tags.BasicTestMethods;, ([Ljava.lang.Object;)V, BasicTestMethods, (o), "+this.positions+JAVADOC_RELEVANCE+"}"
2581
		"BasicTestMethods[METHOD_REF<CONSTRUCTOR>]{BasicTestMethods(Object...), Ljavadoc.methods.tags.BasicTestMethods;, ([Ljava.lang.Object;)V, BasicTestMethods, (o), "+this.positions+R_DRINR+"}"
2582
	);
2582
	);
2583
}
2583
}
2584
}
2584
}
(-)src/org/eclipse/jdt/core/tests/model/CompletionTests2.java (-50 / +50 lines)
Lines 217-223 Link Here
217
		cu.codeComplete(cursorLocation, requestor);
217
		cu.codeComplete(cursorLocation, requestor);
218
218
219
		assertEquals(
219
		assertEquals(
220
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
220
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
221
			requestor.getResults());
221
			requestor.getResults());
222
		
222
		
223
		
223
		
Lines 280-286 Link Here
280
		cu.codeComplete(cursorLocation, requestor);
280
		cu.codeComplete(cursorLocation, requestor);
281
281
282
		assertEquals(
282
		assertEquals(
283
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
283
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
284
			requestor.getResults());
284
			requestor.getResults());
285
	} finally {
285
	} finally {
286
		this.deleteProject("P1");
286
		this.deleteProject("P1");
Lines 342-348 Link Here
342
		cu.codeComplete(cursorLocation, requestor);
342
		cu.codeComplete(cursorLocation, requestor);
343
343
344
		assertEquals(
344
		assertEquals(
345
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
345
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
346
			requestor.getResults());
346
			requestor.getResults());
347
		
347
		
348
		
348
		
Lines 405-411 Link Here
405
		cu.codeComplete(cursorLocation, requestor);
405
		cu.codeComplete(cursorLocation, requestor);
406
406
407
		assertEquals(
407
		assertEquals(
408
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
408
			"element:ZZZ    completion:pz.ZZZ    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED),
409
			requestor.getResults());
409
			requestor.getResults());
410
	} finally {
410
	} finally {
411
		this.deleteProject("P1");
411
		this.deleteProject("P1");
Lines 478-484 Link Here
478
		cu.codeComplete(cursorLocation, requestor);
478
		cu.codeComplete(cursorLocation, requestor);
479
		
479
		
480
		assertResults(
480
		assertResults(
481
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
481
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
482
			requestor.getResults());
482
			requestor.getResults());
483
	} finally {
483
	} finally {
484
		this.deleteProject("P1");
484
		this.deleteProject("P1");
Lines 556-563 Link Here
556
		cu.codeComplete(cursorLocation, requestor);
556
		cu.codeComplete(cursorLocation, requestor);
557
		
557
		
558
		assertResults(
558
		assertResults(
559
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
559
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
560
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
560
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
561
			requestor.getResults());
561
			requestor.getResults());
562
	} finally {
562
	} finally {
563
		this.deleteProject("P1");
563
		this.deleteProject("P1");
Lines 642-648 Link Here
642
		cu.codeComplete(cursorLocation, requestor);
642
		cu.codeComplete(cursorLocation, requestor);
643
		
643
		
644
		assertResults(
644
		assertResults(
645
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
645
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
646
			requestor.getResults());
646
			requestor.getResults());
647
	} finally {
647
	} finally {
648
		this.deleteProject("P1");
648
		this.deleteProject("P1");
Lines 721-728 Link Here
721
		cu.codeComplete(cursorLocation, requestor);
721
		cu.codeComplete(cursorLocation, requestor);
722
		
722
		
723
		assertResults(
723
		assertResults(
724
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
724
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
725
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
725
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
726
			requestor.getResults());
726
			requestor.getResults());
727
	} finally {
727
	} finally {
728
		this.deleteProject("P1");
728
		this.deleteProject("P1");
Lines 804-811 Link Here
804
		cu.codeComplete(cursorLocation, requestor);
804
		cu.codeComplete(cursorLocation, requestor);
805
		
805
		
806
		assertResults(
806
		assertResults(
807
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
807
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
808
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
808
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
809
			requestor.getResults());
809
			requestor.getResults());
810
	} finally {
810
	} finally {
811
		this.deleteProject("P1");
811
		this.deleteProject("P1");
Lines 885-892 Link Here
885
		cu.codeComplete(cursorLocation, requestor);
885
		cu.codeComplete(cursorLocation, requestor);
886
		
886
		
887
		assertResults(
887
		assertResults(
888
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE) + "}\n" +
888
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE) + "}\n" +
889
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
889
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
890
			requestor.getResults());
890
			requestor.getResults());
891
	} finally {
891
	} finally {
892
		this.deleteProject("P1");
892
		this.deleteProject("P1");
Lines 967-974 Link Here
967
		cu.codeComplete(cursorLocation, requestor);
967
		cu.codeComplete(cursorLocation, requestor);
968
		
968
		
969
		assertResults(
969
		assertResults(
970
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
970
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
971
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
971
 			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
972
			requestor.getResults());
972
			requestor.getResults());
973
	} finally {
973
	} finally {
974
		this.deleteProject("P1");
974
		this.deleteProject("P1");
Lines 1048-1054 Link Here
1048
		cu.codeComplete(cursorLocation, requestor);
1048
		cu.codeComplete(cursorLocation, requestor);
1049
		
1049
		
1050
		assertResults(
1050
		assertResults(
1051
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1051
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1052
			requestor.getResults());
1052
			requestor.getResults());
1053
	} finally {
1053
	} finally {
1054
		this.deleteProject("P1");
1054
		this.deleteProject("P1");
Lines 1153-1159 Link Here
1153
		cu.codeComplete(cursorLocation, requestor);
1153
		cu.codeComplete(cursorLocation, requestor);
1154
		
1154
		
1155
		assertResults(
1155
		assertResults(
1156
			"XX3[TYPE_REF]{c.XX3, c, Lc.XX3;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1156
			"XX3[TYPE_REF]{c.XX3, c, Lc.XX3;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1157
			requestor.getResults());
1157
			requestor.getResults());
1158
	} finally {
1158
	} finally {
1159
		this.deleteProject("P1");
1159
		this.deleteProject("P1");
Lines 1251-1257 Link Here
1251
		cu.codeComplete(cursorLocation, requestor);
1251
		cu.codeComplete(cursorLocation, requestor);
1252
		
1252
		
1253
		assertResults(
1253
		assertResults(
1254
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1254
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1255
			requestor.getResults());
1255
			requestor.getResults());
1256
	} finally {
1256
	} finally {
1257
		this.deleteProject("P1");
1257
		this.deleteProject("P1");
Lines 1349-1356 Link Here
1349
		cu.codeComplete(cursorLocation, requestor);
1349
		cu.codeComplete(cursorLocation, requestor);
1350
		
1350
		
1351
		assertResults(
1351
		assertResults(
1352
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1352
			"XX1[TYPE_REF]{a.XX1, a, La.XX1;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1353
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1353
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1354
			requestor.getResults());
1354
			requestor.getResults());
1355
	} finally {
1355
	} finally {
1356
		this.deleteProject("P1");
1356
		this.deleteProject("P1");
Lines 1494-1503 Link Here
1494
		cu.codeComplete(cursorLocation, requestor);
1494
		cu.codeComplete(cursorLocation, requestor);
1495
		
1495
		
1496
		assertResults(
1496
		assertResults(
1497
			"XX12[TYPE_REF]{p12.XX12, p12, Lp12.XX12;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1497
			"XX12[TYPE_REF]{p12.XX12, p12, Lp12.XX12;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1498
			"XX21[TYPE_REF]{p21.XX21, p21, Lp21.XX21;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1498
			"XX21[TYPE_REF]{p21.XX21, p21, Lp21.XX21;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1499
			"XX22[TYPE_REF]{p22.XX22, p22, Lp22.XX22;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1499
			"XX22[TYPE_REF]{p22.XX22, p22, Lp22.XX22;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1500
			"XX32[TYPE_REF]{p32.XX32, p32, Lp32.XX32;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1500
			"XX32[TYPE_REF]{p32.XX32, p32, Lp32.XX32;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1501
			requestor.getResults());
1501
			requestor.getResults());
1502
	} finally {
1502
	} finally {
1503
		this.deleteProject("P1");
1503
		this.deleteProject("P1");
Lines 1642-1653 Link Here
1642
		cu.codeComplete(cursorLocation, requestor);
1642
		cu.codeComplete(cursorLocation, requestor);
1643
		
1643
		
1644
		assertResults(
1644
		assertResults(
1645
			"XX11[TYPE_REF]{p11.XX11, p11, Lp11.XX11;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE) + "}\n" +
1645
			"XX11[TYPE_REF]{p11.XX11, p11, Lp11.XX11;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE) + "}\n" +
1646
			"XX31[TYPE_REF]{p31.XX31, p31, Lp31.XX31;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE) + "}\n" +
1646
			"XX31[TYPE_REF]{p31.XX31, p31, Lp31.XX31;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE) + "}\n" +
1647
			"XX12[TYPE_REF]{p12.XX12, p12, Lp12.XX12;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1647
			"XX12[TYPE_REF]{p12.XX12, p12, Lp12.XX12;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1648
			"XX21[TYPE_REF]{p21.XX21, p21, Lp21.XX21;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1648
			"XX21[TYPE_REF]{p21.XX21, p21, Lp21.XX21;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1649
			"XX22[TYPE_REF]{p22.XX22, p22, Lp22.XX22;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1649
			"XX22[TYPE_REF]{p22.XX22, p22, Lp22.XX22;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1650
			"XX32[TYPE_REF]{p32.XX32, p32, Lp32.XX32;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1650
			"XX32[TYPE_REF]{p32.XX32, p32, Lp32.XX32;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1651
			requestor.getResults());
1651
			requestor.getResults());
1652
	} finally {
1652
	} finally {
1653
		this.deleteProject("P1");
1653
		this.deleteProject("P1");
Lines 1792-1801 Link Here
1792
		cu.codeComplete(cursorLocation, requestor);
1792
		cu.codeComplete(cursorLocation, requestor);
1793
		
1793
		
1794
		assertResults(
1794
		assertResults(
1795
			"XX11[TYPE_REF]{x.y.z.p11.XX11, x.y.z.p11, Lx.y.z.p11.XX11;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1795
			"XX11[TYPE_REF]{x.y.z.p11.XX11, x.y.z.p11, Lx.y.z.p11.XX11;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1796
			"XX21[TYPE_REF]{x.y.z.p21.XX21, x.y.z.p21, Lx.y.z.p21.XX21;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1796
			"XX21[TYPE_REF]{x.y.z.p21.XX21, x.y.z.p21, Lx.y.z.p21.XX21;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1797
			"XX22[TYPE_REF]{x.y.z.p22.XX22, x.y.z.p22, Lx.y.z.p22.XX22;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1797
			"XX22[TYPE_REF]{x.y.z.p22.XX22, x.y.z.p22, Lx.y.z.p22.XX22;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1798
			"XX32[TYPE_REF]{x.y.z.p32.XX32, x.y.z.p32, Lx.y.z.p32.XX32;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1798
			"XX32[TYPE_REF]{x.y.z.p32.XX32, x.y.z.p32, Lx.y.z.p32.XX32;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1799
			requestor.getResults());
1799
			requestor.getResults());
1800
	} finally {
1800
	} finally {
1801
		this.deleteProject("P1");
1801
		this.deleteProject("P1");
Lines 1940-1951 Link Here
1940
		cu.codeComplete(cursorLocation, requestor);
1940
		cu.codeComplete(cursorLocation, requestor);
1941
		
1941
		
1942
		assertResults(
1942
		assertResults(
1943
			"XX12[TYPE_REF]{p12.XX12, p12, Lp12.XX12;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE) + "}\n" +
1943
			"XX12[TYPE_REF]{p12.XX12, p12, Lp12.XX12;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE) + "}\n" +
1944
			"XX31[TYPE_REF]{p31.XX31, p31, Lp31.XX31;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE) + "}\n" +
1944
			"XX31[TYPE_REF]{p31.XX31, p31, Lp31.XX31;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE) + "}\n" +
1945
			"XX11[TYPE_REF]{p11.XX11, p11, Lp11.XX11;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1945
			"XX11[TYPE_REF]{p11.XX11, p11, Lp11.XX11;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1946
			"XX21[TYPE_REF]{p21.XX21, p21, Lp21.XX21;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1946
			"XX21[TYPE_REF]{p21.XX21, p21, Lp21.XX21;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1947
			"XX22[TYPE_REF]{p22.XX22, p22, Lp22.XX22;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1947
			"XX22[TYPE_REF]{p22.XX22, p22, Lp22.XX22;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1948
			"XX32[TYPE_REF]{p32.XX32, p32, Lp32.XX32;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1948
			"XX32[TYPE_REF]{p32.XX32, p32, Lp32.XX32;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1949
			requestor.getResults());
1949
			requestor.getResults());
1950
	} finally {
1950
	} finally {
1951
		this.deleteProject("P1");
1951
		this.deleteProject("P1");
Lines 2027-2033 Link Here
2027
		cu.codeComplete(cursorLocation, requestor);
2027
		cu.codeComplete(cursorLocation, requestor);
2028
		
2028
		
2029
		assertResults(
2029
		assertResults(
2030
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2030
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2031
			requestor.getResults());
2031
			requestor.getResults());
2032
	} finally {
2032
	} finally {
2033
		this.deleteProject("P1");
2033
		this.deleteProject("P1");
Lines 2107-2113 Link Here
2107
		cu.codeComplete(cursorLocation, requestor);
2107
		cu.codeComplete(cursorLocation, requestor);
2108
		
2108
		
2109
		assertResults(
2109
		assertResults(
2110
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2110
			"XX2[TYPE_REF]{b.XX2, b, Lb.XX2;, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2111
			requestor.getResults());
2111
			requestor.getResults());
2112
	} finally {
2112
	} finally {
2113
		this.deleteProject("P1");
2113
		this.deleteProject("P1");
Lines 2182-2188 Link Here
2182
//		cu.codeComplete(cursorLocation, requestor);
2182
//		cu.codeComplete(cursorLocation, requestor);
2183
//		
2183
//		
2184
//		assertResults(
2184
//		assertResults(
2185
//			"foo[METHOD_REF]{foo(), La.XX1;, ()V, foo, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC) + "}",
2185
//			"foo[METHOD_REF]{foo(), La.XX1;, ()V, foo, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC) + "}",
2186
//			requestor.getResults());
2186
//			requestor.getResults());
2187
//	} finally {
2187
//	} finally {
2188
//		this.deleteProject("P1");
2188
//		this.deleteProject("P1");
Lines 2243-2249 Link Here
2243
		cu.codeComplete(cursorLocation, requestor);
2243
		cu.codeComplete(cursorLocation, requestor);
2244
		
2244
		
2245
		assertResults(
2245
		assertResults(
2246
			"Tara[POTENTIAL_METHOD_DECLARATION]{Tara, LBreakRules;, ()V, Tara, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
2246
			"Tara[POTENTIAL_METHOD_DECLARATION]{Tara, LBreakRules;, ()V, Tara, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
2247
			requestor.getResults());
2247
			requestor.getResults());
2248
	} finally {
2248
	} finally {
2249
		this.deleteProject("P1");
2249
		this.deleteProject("P1");
Lines 2297-2304 Link Here
2297
		int cursorLocation = source.lastIndexOf(completeBehind) + completeBehind.length();
2297
		int cursorLocation = source.lastIndexOf(completeBehind) + completeBehind.length();
2298
		unit.codeComplete(cursorLocation, requestor);
2298
		unit.codeComplete(cursorLocation, requestor);
2299
		assertResults(
2299
		assertResults(
2300
			"doit2A[METHOD_REF]{doit2A, Lpack.Util;, (II)V, doit2A, "+(R_DEFAULT + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}\n" +
2300
			"doit2A[METHOD_REF]{doit2A, Lpack.Util;, (II)V, doit2A, "+(R_DEFAULT + R_RESOLVED + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}\n" +
2301
			"doit2B[METHOD_REF]{doit2B, Lpack.Util;, (I)V, doit2B, "+(R_DEFAULT + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}",
2301
			"doit2B[METHOD_REF]{doit2B, Lpack.Util;, (I)V, doit2B, "+(R_DEFAULT + R_RESOLVED + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}",
2302
			requestor.getResults());
2302
			requestor.getResults());
2303
2303
2304
		// change class file to add a third doXXX method and refresh
2304
		// change class file to add a third doXXX method and refresh
Lines 2326-2334 Link Here
2326
		requestor = new CompletionTestsRequestor2();
2326
		requestor = new CompletionTestsRequestor2();
2327
		unit.codeComplete(cursorLocation, requestor);
2327
		unit.codeComplete(cursorLocation, requestor);
2328
		assertResults(
2328
		assertResults(
2329
			"doit2A[METHOD_REF]{doit2A, Lpack.Util;, (II)V, doit2A, "+(R_DEFAULT + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}\n" +
2329
			"doit2A[METHOD_REF]{doit2A, Lpack.Util;, (II)V, doit2A, "+(R_DEFAULT + R_RESOLVED + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}\n" +
2330
			"doit2B[METHOD_REF]{doit2B, Lpack.Util;, (I)V, doit2B, "+(R_DEFAULT + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}\n" +
2330
			"doit2B[METHOD_REF]{doit2B, Lpack.Util;, (I)V, doit2B, "+(R_DEFAULT + R_RESOLVED + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}\n" +
2331
			"doit2C[METHOD_REF]{doit2C, Lpack.Util;, (I)V, doit2C, "+(R_DEFAULT + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}",
2331
			"doit2C[METHOD_REF]{doit2C, Lpack.Util;, (I)V, doit2C, "+(R_DEFAULT + R_RESOLVED + R_CASE + R_INTERESTING + R_NON_RESTRICTED + R_NON_STATIC) + "}",
2332
			requestor.getResults());
2332
			requestor.getResults());
2333
	} finally {
2333
	} finally {
2334
		removeLibraryEntry(this.currentProject, new Path(jarName));
2334
		removeLibraryEntry(this.currentProject, new Path(jarName));
(-)src/org/eclipse/jdt/core/tests/model/JavadocTypeCompletionModelTest.java (-81 / +81 lines)
Lines 209-215 Link Here
209
		"}\n";
209
		"}\n";
210
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "Obj");
210
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "Obj");
211
	assertResults(
211
	assertResults(
212
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
212
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
213
	);
213
	);
214
}
214
}
215
215
Lines 224-231 Link Here
224
		"}\n";
224
		"}\n";
225
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTest");
225
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTest");
226
	assertResults(
226
	assertResults(
227
		"BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+R_DICUNR+"}\n" + 
227
		"BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
228
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICNR+"}"
228
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICNR+"}"
229
	);
229
	);
230
}
230
}
231
231
Lines 240-247 Link Here
240
		"}\n";
240
		"}\n";
241
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTest");
241
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTest");
242
	assertResults(
242
	assertResults(
243
		"BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+R_DICUNR+"}\n" + 
243
		"BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
244
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICNR+"}"
244
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICNR+"}"
245
	);
245
	);
246
}
246
}
247
247
Lines 257-264 Link Here
257
		"}\n";
257
		"}\n";
258
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTest");
258
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTest");
259
	assertResults(
259
	assertResults(
260
		"BasicTestTypes<TPARAM>[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes<TTPARAM;>;, null, null, "+this.positions+R_DICUNR+"}\n" + 
260
		"BasicTestTypes<TPARAM>[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes<TTPARAM;>;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
261
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICNR+"}"
261
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICNR+"}"
262
	);
262
	);
263
}
263
}
264
264
Lines 274-280 Link Here
274
		"}\n";
274
		"}\n";
275
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTest");
275
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTest");
276
	assertResults(
276
	assertResults(
277
		"BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+R_DICNR+"}"
277
		"BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+R_DRICNR+"}"
278
	);
278
	);
279
}
279
}
280
280
Lines 291-297 Link Here
291
		"}\n";
291
		"}\n";
292
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTest");
292
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTest");
293
	assertResults(
293
	assertResults(
294
		"BasicTestTypes<TPARAM>[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes<TTPARAM;>;, null, null, "+this.positions+R_DICNR+"}"
294
		"BasicTestTypes<TPARAM>[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes<TTPARAM;>;, null, null, "+this.positions+R_DRICNR+"}"
295
	);
295
	);
296
}
296
}
297
297
Lines 307-313 Link Here
307
		"}\n";
307
		"}\n";
308
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.la");
308
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.la");
309
	assertResults(
309
	assertResults(
310
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}"
310
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}"
311
	);
311
	);
312
}
312
}
313
313
Lines 323-329 Link Here
323
		"}\n";
323
		"}\n";
324
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.la");
324
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.la");
325
	assertResults(
325
	assertResults(
326
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}"
326
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}"
327
	);
327
	);
328
}
328
}
329
329
Lines 338-346 Link Here
338
		"}\n";
338
		"}\n";
339
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "pack.Bin");
339
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "pack.Bin");
340
	assertSortedResults(
340
	assertSortedResults(
341
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DICQNR+"}\n" + 
341
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
342
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DICQNR+"}\n" + 
342
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
343
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DICQNR+"}"
343
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DRICQNR+"}"
344
	);
344
	);
345
}
345
}
346
346
Lines 355-363 Link Here
355
		"}\n";
355
		"}\n";
356
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "pack.Bin");
356
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "pack.Bin");
357
	assertSortedResults(
357
	assertSortedResults(
358
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DICQNR+"}\n" + 
358
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
359
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DICQNR+"}\n" + 
359
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
360
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DICQNR+"}"
360
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DRICQNR+"}"
361
	);
361
	);
362
}
362
}
363
363
Lines 372-378 Link Here
372
		"}\n";
372
		"}\n";
373
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "pack.Bin2");
373
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "pack.Bin2");
374
	assertSortedResults(
374
	assertSortedResults(
375
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DICENQNR+"}"
375
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DRICENQNR+"}"
376
	);
376
	);
377
}
377
}
378
378
Lines 388-395 Link Here
388
		"}\n";
388
		"}\n";
389
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "I");
389
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "I");
390
	assertSortedResults(
390
	assertSortedResults(
391
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICUNR+"}\n" + 
391
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
392
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNR+"}"
392
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNR+"}"
393
	);
393
	);
394
}
394
}
395
395
Lines 405-424 Link Here
405
		"}\n";
405
		"}\n";
406
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.lang.");
406
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.lang.");
407
	assertSortedResults(
407
	assertSortedResults(
408
		"java.lang.annotation[PACKAGE_REF]{java.lang.annotation, java.lang.annotation, null, null, null, "+this.positions+R_DICQNR+"}\n" + 
408
		"java.lang.annotation[PACKAGE_REF]{java.lang.annotation, java.lang.annotation, null, null, null, "+this.positions+R_DRICQNR+"}\n" + 
409
		"CharSequence[TYPE_REF]{CharSequence, java.lang, Ljava.lang.CharSequence;, null, null, "+this.positions+R_DICNR+"}\n" + 
409
		"CharSequence[TYPE_REF]{CharSequence, java.lang, Ljava.lang.CharSequence;, null, null, "+this.positions+R_DRICNR+"}\n" + 
410
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICNR+"}\n" + 
410
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICNR+"}\n" + 
411
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
411
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
412
		"Comparable[TYPE_REF]{Comparable, java.lang, Ljava.lang.Comparable;, null, null, "+this.positions+R_DICNR+"}\n" + 
412
		"Comparable[TYPE_REF]{Comparable, java.lang, Ljava.lang.Comparable;, null, null, "+this.positions+R_DRICNR+"}\n" + 
413
		"Enum[TYPE_REF]{Enum, java.lang, Ljava.lang.Enum;, null, null, "+this.positions+R_DICNR+"}\n" + 
413
		"Enum[TYPE_REF]{Enum, java.lang, Ljava.lang.Enum;, null, null, "+this.positions+R_DRICNR+"}\n" + 
414
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DICNR+"}\n" + 
414
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DRICNR+"}\n" + 
415
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DICNR+"}\n" + 
415
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DRICNR+"}\n" + 
416
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNR+"}\n" + 
416
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
417
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
417
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
418
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICNR+"}\n" + 
418
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICNR+"}\n" + 
419
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DICNR+"}\n" + 
419
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
420
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICNR+"}\n" + 
420
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICNR+"}\n" + 
421
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DICNR+"}"
421
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DRICNR+"}"
422
	);
422
	);
423
}
423
}
424
424
Lines 433-440 Link Here
433
		"}\n";
433
		"}\n";
434
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.");
434
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.");
435
	assertResults(
435
	assertResults(
436
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}\n" + 
436
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}\n" + 
437
		"java.io[PACKAGE_REF]{java.io, java.io, null, null, null, "+this.positions+R_DICQNR+"}"
437
		"java.io[PACKAGE_REF]{java.io, java.io, null, null, null, "+this.positions+R_DRICQNR+"}"
438
	);
438
	);
439
}
439
}
440
440
Lines 450-458 Link Here
450
		"}\n";
450
		"}\n";
451
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.");
451
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.");
452
	assertResults(
452
	assertResults(
453
		"java.lang.annotation[PACKAGE_REF]{java.lang.annotation, java.lang.annotation, null, null, null, "+this.positions+R_DICQNR+"}\n" + 
453
		"java.lang.annotation[PACKAGE_REF]{java.lang.annotation, java.lang.annotation, null, null, null, "+this.positions+R_DRICQNR+"}\n" + 
454
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}\n" + 
454
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}\n" + 
455
		"java.io[PACKAGE_REF]{java.io, java.io, null, null, null, "+this.positions+R_DICQNR+"}"
455
		"java.io[PACKAGE_REF]{java.io, java.io, null, null, null, "+this.positions+R_DRICQNR+"}"
456
	);
456
	);
457
}
457
}
458
458
Lines 467-482 Link Here
467
		"}\n";
467
		"}\n";
468
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.lang.");
468
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.lang.");
469
	assertSortedResults(
469
	assertSortedResults(
470
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICNR+"}\n" + 
470
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICNR+"}\n" + 
471
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
471
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
472
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DICNR+"}\n" + 
472
		"Error[TYPE_REF]{Error, java.lang, Ljava.lang.Error;, null, null, "+this.positions+R_DRICNR+"}\n" + 
473
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DICNR+"}\n" + 
473
		"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, "+this.positions+R_DRICNR+"}\n" + 
474
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICNR+"}\n" + 
474
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
475
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICNR+"}\n" + 
475
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
476
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICNR+"}\n" + 
476
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICNR+"}\n" + 
477
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DICNR+"}\n" + 
477
		"RuntimeException[TYPE_REF]{RuntimeException, java.lang, Ljava.lang.RuntimeException;, null, null, "+this.positions+R_DRICNR+"}\n" + 
478
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICNR+"}\n" + 
478
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICNR+"}\n" + 
479
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DICNR+"}"
479
		"Throwable[TYPE_REF]{Throwable, java.lang, Ljava.lang.Throwable;, null, null, "+this.positions+R_DRICNR+"}"
480
	);
480
	);
481
}
481
}
482
482
Lines 491-497 Link Here
491
		"}\n";
491
		"}\n";
492
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.lang.Ob");
492
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "java.lang.Ob");
493
	assertResults(
493
	assertResults(
494
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICNR+"}"
494
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICNR+"}"
495
	);
495
	);
496
}
496
}
497
497
Lines 511-517 Link Here
511
		"class BasicTestTypesTestSecondary {}";
511
		"class BasicTestTypesTestSecondary {}";
512
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
512
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
513
	assertResults(
513
	assertResults(
514
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DICUNR+"}"
514
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DRICUNR+"}"
515
	);
515
	);
516
}
516
}
517
517
Lines 528-534 Link Here
528
		"class BasicTestTypesSecondary {}";
528
		"class BasicTestTypesSecondary {}";
529
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
529
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
530
	assertResults(
530
	assertResults(
531
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DICUNR+"}"
531
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DRICUNR+"}"
532
	);
532
	);
533
}
533
}
534
534
Lines 545-551 Link Here
545
		"class BasicTestTypesSecondary {}";
545
		"class BasicTestTypesSecondary {}";
546
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
546
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
547
	assertResults(
547
	assertResults(
548
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DICNR+"}"
548
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DRICNR+"}"
549
	);
549
	);
550
}
550
}
551
551
Lines 562-568 Link Here
562
		"class BasicTestTypesSecondary {}";
562
		"class BasicTestTypesSecondary {}";
563
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
563
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesM");
564
	assertResults(
564
	assertResults(
565
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DICNR+"}"
565
		"BasicTestTypes.BasicTestTypesMember[TYPE_REF]{BasicTestTypesMember, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes$BasicTestTypesMember;, null, null, "+this.positions+R_DRICNR+"}"
566
	);
566
	);
567
}
567
}
568
568
Lines 578-584 Link Here
578
		"class BasicTestTypesSecondary {}";
578
		"class BasicTestTypesSecondary {}";
579
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesS");
579
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BasicTestTypesS");
580
	assertResults(
580
	assertResults(
581
		"BasicTestTypesSecondary[TYPE_REF]{BasicTestTypesSecondary, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypesSecondary;, null, null, "+this.positions+R_DICUNR+"}"
581
		"BasicTestTypesSecondary[TYPE_REF]{BasicTestTypesSecondary, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypesSecondary;, null, null, "+this.positions+R_DRICUNR+"}"
582
	);
582
	);
583
}
583
}
584
584
Lines 594-600 Link Here
594
		"class BasicTestTypesSecondary {}";
594
		"class BasicTestTypesSecondary {}";
595
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTestTypesS");
595
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTestTypesS");
596
	assertResults(
596
	assertResults(
597
		"BasicTestTypesSecondary[TYPE_REF]{BasicTestTypesSecondary, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypesSecondary;, null, null, "+this.positions+R_DICNR+"}"
597
		"BasicTestTypesSecondary[TYPE_REF]{BasicTestTypesSecondary, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypesSecondary;, null, null, "+this.positions+R_DRICNR+"}"
598
	);
598
	);
599
}
599
}
600
600
Lines 610-616 Link Here
610
		"class BasicTestTypesSecondary {}";
610
		"class BasicTestTypesSecondary {}";
611
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTestTypesS");
611
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "javadoc.types.tags.BasicTestTypesS");
612
	assertResults(
612
	assertResults(
613
		"BasicTestTypesSecondary[TYPE_REF]{BasicTestTypesSecondary, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypesSecondary;, null, null, "+this.positions+R_DICNR+"}"
613
		"BasicTestTypesSecondary[TYPE_REF]{BasicTestTypesSecondary, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypesSecondary;, null, null, "+this.positions+R_DRICNR+"}"
614
	);
614
	);
615
}
615
}
616
616
Lines 657-663 Link Here
657
		"}";
657
		"}";
658
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "FIE");
658
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "FIE");
659
	assertResults(
659
	assertResults(
660
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DICNR+"}"
660
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DRICNR+"}"
661
	);
661
	);
662
}
662
}
663
663
Lines 672-678 Link Here
672
		"}";
672
		"}";
673
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "FIE");
673
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "FIE");
674
	assertResults(
674
	assertResults(
675
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DICNR+"}"
675
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DRICNR+"}"
676
	);
676
	);
677
}
677
}
678
678
Lines 688-694 Link Here
688
		"}";
688
		"}";
689
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "fo");
689
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "fo");
690
	assertResults(
690
	assertResults(
691
		"foo[FIELD_REF]{foo, Ljavadoc.types.tags.BasicTestTypes;, I, foo, null, "+this.positions+R_DICNRNS+"}"
691
		"foo[FIELD_REF]{foo, Ljavadoc.types.tags.BasicTestTypes;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
692
	);
692
	);
693
}
693
}
694
694
Lines 704-710 Link Here
704
		"}";
704
		"}";
705
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "fo");
705
	completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "fo");
706
	assertResults(
706
	assertResults(
707
		"foo[FIELD_REF]{foo, Ljavadoc.types.tags.BasicTestTypes;, I, foo, null, "+this.positions+R_DICNRNS+"}"
707
		"foo[FIELD_REF]{foo, Ljavadoc.types.tags.BasicTestTypes;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
708
	);
708
	);
709
}
709
}
710
710
Lines 726-732 Link Here
726
	};
726
	};
727
	completeInJavadoc(sources, true, "fo");
727
	completeInJavadoc(sources, true, "fo");
728
	assertResults(
728
	assertResults(
729
		"foo[FIELD_REF]{foo, Ljavadoc.types.tags.OtherTypes;, I, foo, null, "+this.positions+R_DICNRNS+"}"
729
		"foo[FIELD_REF]{foo, Ljavadoc.types.tags.OtherTypes;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
730
	);
730
	);
731
}
731
}
732
732
Lines 784-790 Link Here
784
	};
784
	};
785
	completeInJavadoc(sources, true, "meth");
785
	completeInJavadoc(sources, true, "meth");
786
	assertResults(
786
	assertResults(
787
		"method[METHOD_REF]{method(), Ljavadoc.types.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
787
		"method[METHOD_REF]{method(), Ljavadoc.types.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
788
	);
788
	);
789
}
789
}
790
790
Lines 806-812 Link Here
806
	};
806
	};
807
	completeInJavadoc(sources, true, "meth");
807
	completeInJavadoc(sources, true, "meth");
808
	assertResults(
808
	assertResults(
809
		"method[METHOD_REF]{method(), Ljavadoc.types.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DICNRNS+"}"
809
		"method[METHOD_REF]{method(), Ljavadoc.types.tags.OtherTypes;, ()V, method, null, "+this.positions+R_DRICNRNS+"}"
810
	);
810
	);
811
}
811
}
812
812
Lines 1026-1032 Link Here
1026
			" */\n" + 
1026
			" */\n" + 
1027
			"public class BasicTestTypes {}\n";
1027
			"public class BasicTestTypes {}\n";
1028
		completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BTT");
1028
		completeInJavadoc("/Completion/src/javadoc/types/tags/BasicTestTypes.java", source, true, "BTT");
1029
		assertResults("BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+"16}");
1029
		assertResults("BasicTestTypes[TYPE_REF]{BasicTestTypes, javadoc.types.tags, Ljavadoc.types.tags.BasicTestTypes;, null, null, "+this.positions+"17}");
1030
	} finally {
1030
	} finally {
1031
		JavaCore.setOptions(oldOptions);
1031
		JavaCore.setOptions(oldOptions);
1032
	}
1032
	}
Lines 1050-1057 Link Here
1050
			1,
1050
			1,
1051
			new int[]{});
1051
			new int[]{});
1052
	assertResults(
1052
	assertResults(
1053
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICUNR+"}\n" + 
1053
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
1054
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICUNRIT+"}"
1054
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICUNRIT+"}"
1055
	);
1055
	);
1056
}
1056
}
1057
public void test101() throws JavaModelException {
1057
public void test101() throws JavaModelException {
Lines 1070-1076 Link Here
1070
			1,
1070
			1,
1071
			new int[]{CompletionProposal.JAVADOC_TYPE_REF});
1071
			new int[]{CompletionProposal.JAVADOC_TYPE_REF});
1072
	assertResults(
1072
	assertResults(
1073
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICUNR+"}"
1073
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICUNR+"}"
1074
	);
1074
	);
1075
}
1075
}
1076
public void test102() throws JavaModelException {
1076
public void test102() throws JavaModelException {
Lines 1089-1095 Link Here
1089
			1,
1089
			1,
1090
			new int[]{CompletionProposal.TYPE_REF});
1090
			new int[]{CompletionProposal.TYPE_REF});
1091
	assertResults(
1091
	assertResults(
1092
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICUNRIT+"}"
1092
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICUNRIT+"}"
1093
	);
1093
	);
1094
}
1094
}
1095
public void test103() throws JavaModelException {
1095
public void test103() throws JavaModelException {
Lines 1110-1116 Link Here
1110
			1,
1110
			1,
1111
			new int[]{});
1111
			new int[]{});
1112
	assertResults(
1112
	assertResults(
1113
			"foo[JAVADOC_METHOD_REF]{{@link ZBasicTestTypes#foo()}, Ljavadoc.types.ZBasicTestTypes;, ()V, foo, null, "+this.positions+R_DICNRNSIT+"}"
1113
			"foo[JAVADOC_METHOD_REF]{{@link ZBasicTestTypes#foo()}, Ljavadoc.types.ZBasicTestTypes;, ()V, foo, null, "+this.positions+R_DRICNRNSIT+"}"
1114
	);
1114
	);
1115
}
1115
}
1116
public void test104() throws JavaModelException {
1116
public void test104() throws JavaModelException {
Lines 1152-1158 Link Here
1152
			1,
1152
			1,
1153
			new int[]{CompletionProposal.METHOD_REF});
1153
			new int[]{CompletionProposal.METHOD_REF});
1154
	assertResults(
1154
	assertResults(
1155
			"foo[JAVADOC_METHOD_REF]{{@link ZBasicTestTypes#foo()}, Ljavadoc.types.ZBasicTestTypes;, ()V, foo, null, "+this.positions+R_DICNRNSIT+"}"
1155
			"foo[JAVADOC_METHOD_REF]{{@link ZBasicTestTypes#foo()}, Ljavadoc.types.ZBasicTestTypes;, ()V, foo, null, "+this.positions+R_DRICNRNSIT+"}"
1156
	);
1156
	);
1157
}
1157
}
1158
public void test106() throws JavaModelException {
1158
public void test106() throws JavaModelException {
Lines 1173-1179 Link Here
1173
			1,
1173
			1,
1174
			new int[]{});
1174
			new int[]{});
1175
	assertResults(
1175
	assertResults(
1176
			"foo[JAVADOC_FIELD_REF]{{@link ZBasicTestTypes#foo}, Ljavadoc.types.ZBasicTestTypes;, I, foo, null, "+this.positions+R_DICNRNSIT+"}"
1176
			"foo[JAVADOC_FIELD_REF]{{@link ZBasicTestTypes#foo}, Ljavadoc.types.ZBasicTestTypes;, I, foo, null, "+this.positions+R_DRICNRNSIT+"}"
1177
	);
1177
	);
1178
}
1178
}
1179
public void test107() throws JavaModelException {
1179
public void test107() throws JavaModelException {
Lines 1215-1221 Link Here
1215
			1,
1215
			1,
1216
			new int[]{CompletionProposal.FIELD_REF});
1216
			new int[]{CompletionProposal.FIELD_REF});
1217
	assertResults(
1217
	assertResults(
1218
			"foo[JAVADOC_FIELD_REF]{{@link ZBasicTestTypes#foo}, Ljavadoc.types.ZBasicTestTypes;, I, foo, null, "+this.positions+R_DICNRNSIT+"}"
1218
			"foo[JAVADOC_FIELD_REF]{{@link ZBasicTestTypes#foo}, Ljavadoc.types.ZBasicTestTypes;, I, foo, null, "+this.positions+R_DRICNRNSIT+"}"
1219
	);
1219
	);
1220
}
1220
}
1221
public void test109() throws JavaModelException {
1221
public void test109() throws JavaModelException {
Lines 1234-1241 Link Here
1234
			1,
1234
			1,
1235
			new int[]{});
1235
			new int[]{});
1236
	assertResults(
1236
	assertResults(
1237
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICNR+"}\n" + 
1237
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICNR+"}\n" + 
1238
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICNRIT+"}"
1238
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICNRIT+"}"
1239
	);
1239
	);
1240
}
1240
}
1241
public void test110() throws JavaModelException {
1241
public void test110() throws JavaModelException {
Lines 1254-1260 Link Here
1254
			1,
1254
			1,
1255
			new int[]{CompletionProposal.JAVADOC_TYPE_REF});
1255
			new int[]{CompletionProposal.JAVADOC_TYPE_REF});
1256
	assertResults(
1256
	assertResults(
1257
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICNR+"}"
1257
			"ZBasicTestTypes[TYPE_REF]{ZBasicTestTypes, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICNR+"}"
1258
	);
1258
	);
1259
}
1259
}
1260
public void test111() throws JavaModelException {
1260
public void test111() throws JavaModelException {
Lines 1273-1279 Link Here
1273
			1,
1273
			1,
1274
			new int[]{CompletionProposal.TYPE_REF});
1274
			new int[]{CompletionProposal.TYPE_REF});
1275
	assertResults(
1275
	assertResults(
1276
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DICNRIT+"}"
1276
			"ZBasicTestTypes[JAVADOC_TYPE_REF]{{@link ZBasicTestTypes}, javadoc.types, Ljavadoc.types.ZBasicTestTypes;, null, null, "+this.positions+R_DRICNRIT+"}"
1277
	);
1277
	);
1278
}
1278
}
1279
public void test112() throws JavaModelException {
1279
public void test112() throws JavaModelException {
Lines 1294-1301 Link Here
1294
			1,
1294
			1,
1295
			new int[]{});
1295
			new int[]{});
1296
	assertResults(
1296
	assertResults(
1297
			"ZBasicTestTypes.Inner[TYPE_REF]{Inner, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DICNR+"}\n" + 
1297
			"ZBasicTestTypes.Inner[TYPE_REF]{Inner, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DRICNR+"}\n" + 
1298
			"ZBasicTestTypes.Inner[JAVADOC_TYPE_REF]{{@link Inner}, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DICNRIT+"}"
1298
			"ZBasicTestTypes.Inner[JAVADOC_TYPE_REF]{{@link Inner}, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DRICNRIT+"}"
1299
	);
1299
	);
1300
}
1300
}
1301
public void test113() throws JavaModelException {
1301
public void test113() throws JavaModelException {
Lines 1316-1322 Link Here
1316
			1,
1316
			1,
1317
			new int[]{CompletionProposal.JAVADOC_TYPE_REF});
1317
			new int[]{CompletionProposal.JAVADOC_TYPE_REF});
1318
	assertResults(
1318
	assertResults(
1319
			"ZBasicTestTypes.Inner[TYPE_REF]{Inner, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DICNR+"}"
1319
			"ZBasicTestTypes.Inner[TYPE_REF]{Inner, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DRICNR+"}"
1320
	);
1320
	);
1321
}
1321
}
1322
public void test114() throws JavaModelException {
1322
public void test114() throws JavaModelException {
Lines 1337-1343 Link Here
1337
			1,
1337
			1,
1338
			new int[]{CompletionProposal.TYPE_REF});
1338
			new int[]{CompletionProposal.TYPE_REF});
1339
	assertResults(
1339
	assertResults(
1340
			"ZBasicTestTypes.Inner[JAVADOC_TYPE_REF]{{@link Inner}, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DICNRIT+"}"
1340
			"ZBasicTestTypes.Inner[JAVADOC_TYPE_REF]{{@link Inner}, javadoc.types, Ljavadoc.types.ZBasicTestTypes$Inner;, null, null, "+this.positions+R_DRICNRIT+"}"
1341
	);
1341
	);
1342
}
1342
}
1343
}
1343
}
(-)src/org/eclipse/jdt/core/tests/model/AbstractJavadocCompletionModelTest.java (-110 / +114 lines)
Lines 28-163 Link Here
28
28
29
	// Basic relevance values
29
	// Basic relevance values
30
	/** R_DEFAULT+R_INTERESTING+R_NON_RESTRICTED<br>= 8 */
30
	/** R_DEFAULT+R_INTERESTING+R_NON_RESTRICTED<br>= 8 */
31
	protected final static int JAVADOC_RELEVANCE = R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED;
31
	protected final static int JAVADOC_RELEVANCE = R_DEFAULT+ R_INTERESTING+ R_NON_RESTRICTED;
32
	/** R_DEFAULT+R_INTERESTING<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 11 */
32
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 9 */
33
	protected final static int R_DIUNR= R_DEFAULT+R_INTERESTING+R_UNQUALIFIED+R_NON_RESTRICTED;
33
	protected final static int R_DRINR= R_DEFAULT+R_RESOLVED+R_INTERESTING+R_NON_RESTRICTED;
34
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED<br>= 18 */
34
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 12 */
35
	protected static final int R_DICNR = R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED;
35
	protected final static int R_DRIUNR= R_DEFAULT+R_RESOLVED+R_INTERESTING+R_UNQUALIFIED+R_NON_RESTRICTED;
36
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_QUALIFIED+R_NON_RESTRICTED<br>= 20 */
36
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED<br>= 19 */
37
	protected static final int R_DICQNR = R_DEFAULT+R_INTERESTING+R_CASE+R_QUALIFIED+R_NON_RESTRICTED;
37
	protected static final int R_DRICNR = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_NON_RESTRICTED;
38
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 21 */
38
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_QUALIFIED+R_NON_RESTRICTED<br>= 21 */
39
	protected static final int R_DICUNR = R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED+R_NON_RESTRICTED;
39
	protected static final int R_DRICQNR = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_QUALIFIED+R_NON_RESTRICTED;
40
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED<br>= 22 */
40
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 22 */
41
	protected static final int R_DICENNR = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_NON_RESTRICTED;
41
	protected static final int R_DRICUNR = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_UNQUALIFIED+R_NON_RESTRICTED;
42
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_QUALIFIED+R_NON_RESTRICTED<br>= 24 */
42
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED<br>= 23 */
43
	protected static final int R_DICENQNR = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_QUALIFIED+R_NON_RESTRICTED;
43
	protected static final int R_DRICENNR = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_EXACT_NAME+R_NON_RESTRICTED;
44
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 25 */
44
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_QUALIFIED+R_NON_RESTRICTED<br>= 25 */
45
	protected static final int R_DICENUNR = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_UNQUALIFIED+R_NON_RESTRICTED;
45
	protected static final int R_DRICENQNR = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_EXACT_NAME+R_QUALIFIED+R_NON_RESTRICTED;
46
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_NON_STATIC<br>= 29 */
46
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED<br>= 26 */
47
	protected static final int R_DICNRNS = R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED+R_NON_STATIC;
47
	protected static final int R_DRICENUNR = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_EXACT_NAME+R_UNQUALIFIED+R_NON_RESTRICTED;
48
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_NON_STATIC<br>= 33 */
48
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_NON_STATIC<br>= 30 */
49
	protected static final int R_DICENNRNS = R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME+R_NON_RESTRICTED+R_NON_STATIC;
49
	protected static final int R_DRICNRNS = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_NON_RESTRICTED+R_NON_STATIC;
50
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_NON_STATIC<br>= 34 */
51
	protected static final int R_DRICENNRNS = R_DEFAULT+R_RESOLVED+R_INTERESTING+R_CASE+R_EXACT_NAME+R_NON_RESTRICTED+R_NON_STATIC;
50
52
51
	// Exception relevance values
53
	// Exception relevance values
52
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_EXCEPTION<br>= 38 */
54
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_EXCEPTION<br>= 39 */
53
	protected static final int R_DICNRE = R_DICNR+R_EXCEPTION;
55
	protected static final int R_DRICNRE = R_DRICNR+R_EXCEPTION;
54
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>= 41 */
56
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>= 42 */
55
	protected static final int R_DICUNRE = R_DICUNR+R_EXCEPTION;
57
	protected static final int R_DRICUNRE = R_DRICUNR+R_EXCEPTION;
56
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_EXCEPTION<br>= 42 */
58
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_EXCEPTION<br>= 43 */
57
	protected static final int R_DICENNRE = R_DICENNR+R_EXCEPTION;
59
	protected static final int R_DRICENNRE = R_DRICENNR+R_EXCEPTION;
58
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>= 45 */
60
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>= 46 */
59
	protected static final int R_DICENUNRE = R_DICENUNR+R_EXCEPTION;
61
	protected static final int R_DRICENUNRE = R_DRICENUNR+R_EXCEPTION;
60
62
61
	// Exact Expected relevance values
63
	// Exact Expected relevance values
62
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>= 48 */
64
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>= 49 */
63
	protected static final int R_DICNREET = R_DICNR+R_EXACT_EXPECTED_TYPE;
65
	protected static final int R_DRICNREET = R_DRICNR+R_EXACT_EXPECTED_TYPE;
64
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>= 51 */
66
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>= 52 */
65
	protected static final int R_DICUNREET = R_DICUNR+R_EXACT_EXPECTED_TYPE;
67
	protected static final int R_DRICUNREET = R_DRICUNR+R_EXACT_EXPECTED_TYPE;
66
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE+R_EXCEPTION<br>= 71 */
68
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE+R_EXCEPTION<br>= 72 */
67
	protected static final int R_DICUNREETE = R_DICUNR+R_EXACT_EXPECTED_TYPE+R_EXCEPTION;
69
	protected static final int R_DRICUNREETE = R_DRICUNR+R_EXACT_EXPECTED_TYPE+R_EXCEPTION;
68
70
69
	// Exact Expected Exception relevance values
71
	// Exact Expected Exception relevance values
70
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED<br>+R_EXCEPTION+R_EXACT_EXPECTED_TYPE<br>= 68 */
72
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_NON_RESTRICTED<br>+R_EXCEPTION+R_EXACT_EXPECTED_TYPE<br>= 69 */
71
	protected static final int R_DICNREEET = R_DICNRE+R_EXACT_EXPECTED_TYPE;
73
	protected static final int R_DRICNREEET = R_DRICNRE+R_EXACT_EXPECTED_TYPE;
72
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXCEPTION<br>
74
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXCEPTION<br>
73
	 * +R_EXACT_EXPECTED_TYPE<br>= 71 */
74
	protected static final int R_DICUNREEET = R_DICUNRE+R_EXACT_EXPECTED_TYPE;
75
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_EXCEPTION<br>
76
	 * +R_EXACT_EXPECTED_TYPE<br>= 72 */
75
	 * +R_EXACT_EXPECTED_TYPE<br>= 72 */
77
	protected static final int R_DICENNREEET = R_DICENNRE+R_EXACT_EXPECTED_TYPE;
76
	protected static final int R_DRICUNREEET = R_DRICUNRE+R_EXACT_EXPECTED_TYPE;
78
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>
77
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_EXCEPTION<br>
79
	 * +R_EXACT_EXPECTED_TYPE<br>= 75 */
78
	 * +R_EXACT_EXPECTED_TYPE<br>= 73 */
80
	protected static final int R_DICENUNREEET = R_DICENUNRE+R_EXACT_EXPECTED_TYPE;
79
	protected static final int R_DRICENNREEET = R_DRICENNRE+R_EXACT_EXPECTED_TYPE;
80
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_EXCEPTION<br>
81
	 * +R_EXACT_EXPECTED_TYPE<br>= 76 */
82
	protected static final int R_DRICENUNREEET = R_DRICENUNRE+R_EXACT_EXPECTED_TYPE;
81
83
82
	// Inline tag relevance values
84
	// Inline tag relevance values
83
	/** R_DEFAULT+R_INTERESTING+R_NON_RESTRICTED<br>+R_INLINE_TAG<br>= 39 */
85
	/** R_DEFAULT+R_INTERESTING+R_NON_RESTRICTED<br>+R_INLINE_TAG<br>= 39 */
84
	protected static final int JAVADOC_RELEVANCE_IT = JAVADOC_RELEVANCE+R_INLINE_TAG;
86
	protected static final int JAVADOC_RELEVANCE_IT = JAVADOC_RELEVANCE+R_INLINE_TAG;
85
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 49 */
87
	/** R_DEFAULT+R_RESOLVED<br+R_INTERESTING+R_NON_RESTRICTED<br>+R_INLINE_TAG<br>= 40 */
86
	protected static final int R_DICNRIT = R_DICNR+R_INLINE_TAG;
88
	protected static final int R_DRINRIT = R_DRINR+R_INLINE_TAG;
87
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 52 */
89
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 50 */
88
	protected static final int R_DICUNRIT = R_DICUNR+R_INLINE_TAG;
90
	protected static final int R_DRICNRIT = R_DRICNR+R_INLINE_TAG;
89
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 53 */
91
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 53 */
90
	protected static final int R_DICENNRIT = R_DICENNR+R_INLINE_TAG;
92
	protected static final int R_DRICUNRIT = R_DRICUNR+R_INLINE_TAG;
91
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_INLINE_TAG<br>= 56 */
93
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_NON_RESTRICTED+R_INLINE_TAG<br>= 54 */
92
	protected static final int R_DICENUNRIT = R_DICENUNR+R_INLINE_TAG;
94
	protected static final int R_DRICENNRIT = R_DRICENNR+R_INLINE_TAG;
93
	/** R_DEFAULT+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_NON_STATIC+R_INLINE_TAG<br>= 60 */
95
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_EXACT_NAME<br>+R_UNQUALIFIED+R_NON_RESTRICTED+R_INLINE_TAG<br>= 57 */
94
	protected static final int R_DICNRNSIT = R_DICNRNS+R_INLINE_TAG;
96
	protected static final int R_DRICENUNRIT = R_DRICENUNR+R_INLINE_TAG;
95
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_NON_RESTRICTED<br>+R_EXACT_EXPECTED_TYPE+R_INLINE_TAG<br>= 79 */
97
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE<br>+R_NON_RESTRICTED+R_NON_STATIC+R_INLINE_TAG<br>= 61 */
96
	protected static final int R_DICNREETIT = R_DICNREET+R_INLINE_TAG;
98
	protected static final int R_DRICNRNSIT = R_DRICNRNS+R_INLINE_TAG;
97
	/** R_DEFAULT+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>
99
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_NON_RESTRICTED<br>+R_EXACT_EXPECTED_TYPE+R_INLINE_TAG<br>= 80 */
98
	 * +R_INLINE_TAG<br>= 82 */
100
	protected static final int R_DRICNREETIT = R_DRICNREET+R_INLINE_TAG;
99
	protected static final int R_DICUNREETIT = R_DICUNREET+R_INLINE_TAG;
101
	/** R_DEFAULT+R_RESOLVED<br>+R_INTERESTING+R_CASE+R_UNQUALIFIED<br>+R_NON_RESTRICTED+R_EXACT_EXPECTED_TYPE<br>
102
	 * +R_INLINE_TAG<br>= 83 */
103
	protected static final int R_DRICUNREETIT = R_DRICUNREET+R_INLINE_TAG;
100
	
104
	
101
	// Store all relevance values in array
105
	// Store all relevance values in array
102
	private static final int[] RELEVANCES = {
106
	private static final int[] RELEVANCES = {
103
		JAVADOC_RELEVANCE,
107
		JAVADOC_RELEVANCE,
104
		R_DIUNR,
108
		R_DRIUNR,
105
		R_DICNR,
109
		R_DRICNR,
106
		R_DICQNR,
110
		R_DRICQNR,
107
		R_DICUNR,
111
		R_DRICUNR,
108
		R_DICENNR,
112
		R_DRICENNR,
109
		R_DICENQNR,
113
		R_DRICENQNR,
110
		R_DICENUNR,
114
		R_DRICENUNR,
111
		R_DICNRNS,
115
		R_DRICNRNS,
112
		R_DICENNRNS,
116
		R_DRICENNRNS,
113
		R_DICNRE,
117
		R_DRICNRE,
114
		R_DICUNRE,
118
		R_DRICUNRE,
115
		R_DICENNRE,
119
		R_DRICENNRE,
116
		R_DICENUNRE,
120
		R_DRICENUNRE,
117
		R_DICNREET,
121
		R_DRICNREET,
118
		R_DICUNREET,
122
		R_DRICUNREET,
119
		R_DICNREEET,
123
		R_DRICNREEET,
120
		R_DICUNREEET,
124
		R_DRICUNREEET,
121
		R_DICENNREEET,
125
		R_DRICENNREEET,
122
		R_DICENUNREEET,
126
		R_DRICENUNREEET,
123
		JAVADOC_RELEVANCE_IT,
127
		JAVADOC_RELEVANCE_IT,
124
		R_DICNRIT,
128
		R_DRICNRIT,
125
		R_DICUNRIT,
129
		R_DRICUNRIT,
126
		R_DICENNRIT,
130
		R_DRICENNRIT,
127
		R_DICENUNRIT,
131
		R_DRICENUNRIT,
128
		R_DICNRNSIT,
132
		R_DRICNRNSIT,
129
		R_DICNREETIT,
133
		R_DRICNREETIT,
130
		R_DICUNREETIT,
134
		R_DRICUNREETIT,
131
	};
135
	};
132
	private static final String[] RELEVANCES_NAMES = {
136
	private static final String[] RELEVANCES_NAMES = {
133
		"JAVADOC_RELEVANCE",
137
		"JAVADOC_RELEVANCE",
134
		"R_DIUNR",
138
		"R_DRIUNR",
135
		"R_DICNR",
139
		"R_DRICNR",
136
		"R_DICQNR",
140
		"R_DRICQNR",
137
		"R_DICUNR",
141
		"R_DRICUNR",
138
		"R_DICENNR",
142
		"R_DRICENNR",
139
		"R_DICENQNR",
143
		"R_DRICENQNR",
140
		"R_DICENUNR",
144
		"R_DRICENUNR",
141
		"R_DICNRNS",
145
		"R_DRICNRNS",
142
		"R_DICENNRNS",
146
		"R_DRICENNRNS",
143
		"R_DICNRE",
147
		"R_DRICNRE",
144
		"R_DICUNRE",
148
		"R_DRICUNRE",
145
		"R_DICENNRE",
149
		"R_DRICENNRE",
146
		"R_DICENUNRE",
150
		"R_DRICENUNRE",
147
		"R_DICNREET",
151
		"R_DRICNREET",
148
		"R_DICUNREET",
152
		"R_DRICUNREET",
149
		"R_DICNREEET",
153
		"R_DRICNREEET",
150
		"R_DICUNREEET",
154
		"R_DRICUNREEET",
151
		"R_DICENNREEET",
155
		"R_DRICENNREEET",
152
		"R_DICENUNREEET",
156
		"R_DRICENUNREEET",
153
		"JAVADOC_RELEVANCE_IT",
157
		"JAVADOC_RELEVANCE_IT",
154
		"R_DICNRIT",
158
		"R_DRICNRIT",
155
		"R_DICUNRIT",
159
		"R_DRICUNRIT",
156
		"R_DICENNRIT",
160
		"R_DRICENNRIT",
157
		"R_DICENUNRIT",
161
		"R_DRICENUNRIT",
158
		"R_DICNRNSIT",
162
		"R_DRICNRNSIT",
159
		"R_DICNREETIT",
163
		"R_DRICNREETIT",
160
		"R_DICUNREETIT",
164
		"R_DRICUNREETIT",
161
	};
165
	};
162
166
163
	// Write file contents
167
	// Write file contents
(-)src/org/eclipse/jdt/core/tests/model/CompletionWithMissingTypesTests_1_5.java (-11 / +11 lines)
Lines 64-70 Link Here
64
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
64
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
65
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
65
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
66
66
67
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
67
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
68
	int start1 = str.lastIndexOf("m.b") + "m.".length();
68
	int start1 = str.lastIndexOf("m.b") + "m.".length();
69
	int end1 = start1 + "b".length();
69
	int end1 = start1 + "b".length();
70
	int start2 = str.lastIndexOf("MissingType");
70
	int start2 = str.lastIndexOf("MissingType");
Lines 108-114 Link Here
108
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
108
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
109
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
109
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
110
110
111
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
111
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
112
	int start1 = str.lastIndexOf("m.b") + "m.".length();
112
	int start1 = str.lastIndexOf("m.b") + "m.".length();
113
	int end1 = start1 + "b".length();
113
	int end1 = start1 + "b".length();
114
	int start2 = str.lastIndexOf("MissingType2");
114
	int start2 = str.lastIndexOf("MissingType2");
Lines 159-165 Link Here
159
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
159
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
160
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
160
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
161
161
162
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
162
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
163
	int start1 = str.lastIndexOf("m.b") + "m.".length();
163
	int start1 = str.lastIndexOf("m.b") + "m.".length();
164
	int end1 = start1 + "b".length();
164
	int end1 = start1 + "b".length();
165
	int start2 = str.lastIndexOf("MissingType2");
165
	int start2 = str.lastIndexOf("MissingType2");
Lines 206-212 Link Here
206
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
206
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
207
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
207
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
208
208
209
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
209
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
210
	int start1 = str.lastIndexOf("m.b") + "m.".length();
210
	int start1 = str.lastIndexOf("m.b") + "m.".length();
211
	int end1 = start1 + "b".length();
211
	int end1 = start1 + "b".length();
212
	int start2 = str.lastIndexOf("MissingType<");
212
	int start2 = str.lastIndexOf("MissingType<");
Lines 269-275 Link Here
269
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
269
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
270
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
270
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
271
271
272
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
272
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
273
	int start1 = str.lastIndexOf("m.b") + "m.".length();
273
	int start1 = str.lastIndexOf("m.b") + "m.".length();
274
	int end1 = start1 + "b".length();
274
	int end1 = start1 + "b".length();
275
	int start2 = str.lastIndexOf("MissingType1");
275
	int start2 = str.lastIndexOf("MissingType1");
Lines 324-330 Link Here
324
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
324
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
325
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
325
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
326
326
327
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
327
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
328
	int start1 = str.lastIndexOf("m(0, 0).b") + "m(0, 0).".length();
328
	int start1 = str.lastIndexOf("m(0, 0).b") + "m(0, 0).".length();
329
	int end1 = start1 + "b".length();
329
	int end1 = start1 + "b".length();
330
	int start2 = str.lastIndexOf("MissingType");
330
	int start2 = str.lastIndexOf("MissingType");
Lines 367-373 Link Here
367
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
367
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
368
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
368
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
369
369
370
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
370
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
371
	int start1 = str.lastIndexOf("m.b") + "m.".length();
371
	int start1 = str.lastIndexOf("m.b") + "m.".length();
372
	int end1 = start1 + "b".length();
372
	int end1 = start1 + "b".length();
373
	int start2 = str.lastIndexOf("MissingType");
373
	int start2 = str.lastIndexOf("MissingType");
Lines 406-412 Link Here
406
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
406
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
407
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
407
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
408
408
409
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
409
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
410
	int start1 = str.lastIndexOf("m.b") + "m.".length();
410
	int start1 = str.lastIndexOf("m.b") + "m.".length();
411
	int end1 = start1 + "b".length();
411
	int end1 = start1 + "b".length();
412
	int start2 = str.lastIndexOf("MissingType");
412
	int start2 = str.lastIndexOf("MissingType");
Lines 476-482 Link Here
476
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
476
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
477
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
477
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
478
478
479
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
479
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
480
	int start1 = str.lastIndexOf("m.b") + "m.".length();
480
	int start1 = str.lastIndexOf("m.b") + "m.".length();
481
	int end1 = start1 + "b".length();
481
	int end1 = start1 + "b".length();
482
	int start2 = str.lastIndexOf("MissingType");
482
	int start2 = str.lastIndexOf("MissingType");
Lines 553-560 Link Here
553
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
553
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
554
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
554
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
555
555
556
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
556
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED;
557
	int relevance2 = R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
557
	int relevance2 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED + R_NO_PROBLEMS;
558
	int start1 = str.lastIndexOf("m.b") + "m.".length();
558
	int start1 = str.lastIndexOf("m.b") + "m.".length();
559
	int end1 = start1 + "b".length();
559
	int end1 = start1 + "b".length();
560
	int start2 = str.lastIndexOf("MissingType");
560
	int start2 = str.lastIndexOf("MissingType");
(-)src/org/eclipse/jdt/core/tests/model/SnippetCompletionTests_1_5.java (-2 / +2 lines)
Lines 60-67 Link Here
60
	type.codeComplete(snippet.toCharArray(), -1, snippet.length(), typeNames, names, modifiers, false, requestor);
60
	type.codeComplete(snippet.toCharArray(), -1, snippet.length(), typeNames, names, modifiers, false, requestor);
61
	
61
	
62
	assertResults(
62
	assertResults(
63
		"foo1[METHOD_REF]{foo1(), Lbug132665.Bug132665;, ()V, foo1, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
63
		"foo1[METHOD_REF]{foo1(), Lbug132665.Bug132665;, ()V, foo1, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
64
		"foo3[METHOD_REF]{foo3(), Lbug132665.Bug132665;, ()V, foo3, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
64
		"foo3[METHOD_REF]{foo3(), Lbug132665.Bug132665;, ()V, foo3, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
65
		requestor.getResults());
65
		requestor.getResults());
66
}
66
}
67
}
67
}
(-)src/org/eclipse/jdt/core/tests/model/SnippetCompletionTests.java (-41 / +41 lines)
Lines 81-91 Link Here
81
	int tokenStart = snippet.lastIndexOf("var");
81
	int tokenStart = snippet.lastIndexOf("var");
82
	int tokenEnd = tokenStart + "var".length();
82
	int tokenEnd = tokenStart + "var".length();
83
	assertResults(
83
	assertResults(
84
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
84
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
85
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
85
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
86
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
86
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
87
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
87
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
88
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
88
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
89
		requestor.getResults());
89
		requestor.getResults());
90
}
90
}
91
91
Lines 114-125 Link Here
114
	int tokenStart = snippet.lastIndexOf("var");
114
	int tokenStart = snippet.lastIndexOf("var");
115
	int tokenEnd = tokenStart + "var".length();
115
	int tokenEnd = tokenStart + "var".length();
116
	assertResults(
116
	assertResults(
117
		"Victory[TYPE_REF]{Victory, aa.bb.cc, LVictory;, null, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
117
		"Victory[TYPE_REF]{Victory, aa.bb.cc, LVictory;, null, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
118
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
118
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
119
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
119
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
120
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
120
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
121
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
121
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
122
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
122
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
123
		requestor.getResults());
123
		requestor.getResults());
124
}
124
}
125
125
Lines 148-159 Link Here
148
	int tokenStart = snippet.lastIndexOf("var");
148
	int tokenStart = snippet.lastIndexOf("var");
149
	int tokenEnd = tokenStart + "var".length();
149
	int tokenEnd = tokenStart + "var".length();
150
	assertResults(
150
	assertResults(
151
		"Victory[TYPE_REF]{Victory, aa.bb.cc, LVictory;, null, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
151
		"Victory[TYPE_REF]{Victory, aa.bb.cc, LVictory;, null, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
152
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
152
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
153
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
153
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
154
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
154
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
155
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
155
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
156
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
156
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
157
		requestor.getResults());
157
		requestor.getResults());
158
}
158
}
159
159
Lines 179-189 Link Here
179
	int tokenStart = snippet.lastIndexOf("var");
179
	int tokenStart = snippet.lastIndexOf("var");
180
	int tokenEnd = tokenStart + "var".length();
180
	int tokenEnd = tokenStart + "var".length();
181
	assertResults(
181
	assertResults(
182
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
182
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
183
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
183
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
184
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
184
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
185
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
185
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
186
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
186
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
187
		requestor.getResults());
187
		requestor.getResults());
188
}
188
}
189
189
Lines 213-223 Link Here
213
	int tokenStart = snippet.lastIndexOf("var");
213
	int tokenStart = snippet.lastIndexOf("var");
214
	int tokenEnd = tokenStart + "var".length();
214
	int tokenEnd = tokenStart + "var".length();
215
	assertResults(
215
	assertResults(
216
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
216
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
217
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
217
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
218
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
218
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
219
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
219
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
220
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
220
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, Laa.bb.cc.SuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
221
		requestor.getResults());
221
		requestor.getResults());
222
}
222
}
223
/*
223
/*
Lines 242-252 Link Here
242
	int tokenStart = snippet.lastIndexOf("var");
242
	int tokenStart = snippet.lastIndexOf("var");
243
	int tokenEnd = tokenStart + "var".length();
243
	int tokenEnd = tokenStart + "var".length();
244
	assertResults(
244
	assertResults(
245
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
245
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
246
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
246
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
247
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
247
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
248
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
248
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
249
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, LSuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
249
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, LSuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
250
		requestor.getResults());
250
		requestor.getResults());
251
}
251
}
252
/*
252
/*
Lines 271-282 Link Here
271
	int tokenStart = snippet.lastIndexOf("var");
271
	int tokenStart = snippet.lastIndexOf("var");
272
	int tokenEnd = tokenStart + "var".length();
272
	int tokenEnd = tokenStart + "var".length();
273
	assertResults(
273
	assertResults(
274
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
274
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
275
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
275
		"var[LOCAL_VARIABLE_REF]{var, null, I, var, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
276
		"varFoo[METHOD_REF]{varFoo(), Lxx.yy.MyInterface2;, ()V, varFoo, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
276
		"varFoo[METHOD_REF]{varFoo(), Lxx.yy.MyInterface2;, ()V, varFoo, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
277
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
277
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
278
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
278
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
279
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, LSuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
279
		"varsc[LOCAL_VARIABLE_REF]{varsc, null, LSuperClass;, varsc, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
280
		requestor.getResults());
280
		requestor.getResults());
281
}
281
}
282
public void testCodeSnippetAssistForClassFileWithDollar() throws JavaModelException {
282
public void testCodeSnippetAssistForClassFileWithDollar() throws JavaModelException {
Lines 298-306 Link Here
298
	int tokenStart = snippet.lastIndexOf("var");
298
	int tokenStart = snippet.lastIndexOf("var");
299
	int tokenEnd = tokenStart + "var".length();
299
	int tokenEnd = tokenStart + "var".length();
300
	assertResults(
300
	assertResults(
301
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
301
		"void[KEYWORD]{void, null, null, void, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
302
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
302
		"varX[LOCAL_VARIABLE_REF]{varX, null, I, varX, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
303
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
303
		"varY[LOCAL_VARIABLE_REF]{varY, null, I, varY, ["+tokenStart+", "+tokenEnd+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
304
		requestor.getResults());
304
		requestor.getResults());
305
}
305
}
306
306
(-)src/org/eclipse/jdt/core/tests/model/JavadocFieldCompletionModelTest.java (-58 / +58 lines)
Lines 201-207 Link Here
201
		"}\n";
201
		"}\n";
202
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "Obj");
202
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "Obj");
203
	assertResults(
203
	assertResults(
204
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
204
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
205
	);
205
	);
206
}
206
}
207
207
Lines 217-224 Link Here
217
		"}\n";
217
		"}\n";
218
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "BasicTest", 2);
218
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "BasicTest", 2);
219
	assertResults(
219
	assertResults(
220
		"BasicTestFields[TYPE_REF]{BasicTestFields, javadoc.fields.tags, Ljavadoc.fields.tags.BasicTestFields;, null, null, "+this.positions+R_DICUNR+"}\n" + 
220
		"BasicTestFields[TYPE_REF]{BasicTestFields, javadoc.fields.tags, Ljavadoc.fields.tags.BasicTestFields;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
221
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICNR+"}"
221
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICNR+"}"
222
	);
222
	);
223
}
223
}
224
224
Lines 235-241 Link Here
235
		"}\n";
235
		"}\n";
236
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "javadoc.fields.tags.BasicTest");
236
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "javadoc.fields.tags.BasicTest");
237
	assertResults(
237
	assertResults(
238
		"BasicTestFields[TYPE_REF]{BasicTestFields, javadoc.fields.tags, Ljavadoc.fields.tags.BasicTestFields;, null, null, "+this.positions+R_DICNR+"}"
238
		"BasicTestFields[TYPE_REF]{BasicTestFields, javadoc.fields.tags, Ljavadoc.fields.tags.BasicTestFields;, null, null, "+this.positions+R_DRICNR+"}"
239
	);
239
	);
240
}
240
}
241
241
Lines 252-258 Link Here
252
		"}\n";
252
		"}\n";
253
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "java.la");
253
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "java.la");
254
	assertResults(
254
	assertResults(
255
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DICQNR+"}"
255
		"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, null, "+this.positions+R_DRICQNR+"}"
256
	);
256
	);
257
}
257
}
258
258
Lines 268-276 Link Here
268
		"}\n";
268
		"}\n";
269
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "pack.Bin");
269
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "pack.Bin");
270
	assertSortedResults(
270
	assertSortedResults(
271
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DICQNR+"}\n" + 
271
		"Bin1[TYPE_REF]{pack.Bin1, pack, Lpack.Bin1;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
272
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DICQNR+"}\n" + 
272
		"Bin2[TYPE_REF]{pack.Bin2, pack, Lpack.Bin2;, null, null, "+this.positions+R_DRICQNR+"}\n" + 
273
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DICQNR+"}"
273
		"Bin3[TYPE_REF]{pack.Bin3, pack, Lpack.Bin3;, null, null, "+this.positions+R_DRICQNR+"}"
274
	);
274
	);
275
}
275
}
276
276
Lines 287-294 Link Here
287
		"}\n";
287
		"}\n";
288
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "I");
288
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "I");
289
	assertSortedResults(
289
	assertSortedResults(
290
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICUNR+"}\n" + 
290
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
291
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNR+"}"
291
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNR+"}"
292
	);
292
	);
293
}
293
}
294
294
Lines 307-313 Link Here
307
		"}";
307
		"}";
308
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "fo");
308
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "fo");
309
	assertResults(
309
	assertResults(
310
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DICNRNS+"}"
310
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
311
	);
311
	);
312
}
312
}
313
313
Lines 323-329 Link Here
323
		"}";
323
		"}";
324
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "fo");
324
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "fo");
325
	assertResults(
325
	assertResults(
326
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DICNRNS+"}"
326
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
327
	);
327
	);
328
}
328
}
329
329
Lines 339-345 Link Here
339
		"}";
339
		"}";
340
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "fo");
340
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "fo");
341
	assertResults(
341
	assertResults(
342
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DICNRNS+"}"
342
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}"
343
	);
343
	);
344
}
344
}
345
345
Lines 362-368 Link Here
362
	};
362
	};
363
	completeInJavadoc(sources, true, "oth");
363
	completeInJavadoc(sources, true, "oth");
364
	assertResults(
364
	assertResults(
365
		"other[FIELD_REF]{other, Ljavadoc.fields.tags.OtherFields;, I, other, null, "+this.positions+R_DICNRNS+"}"
365
		"other[FIELD_REF]{other, Ljavadoc.fields.tags.OtherFields;, I, other, null, "+this.positions+R_DRICNRNS+"}"
366
	);
366
	);
367
}
367
}
368
368
Lines 379-398 Link Here
379
		"}";
379
		"}";
380
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "#", 0); // completion on empty token
380
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "#", 0); // completion on empty token
381
	assertResults(
381
	assertResults(
382
		"obj[FIELD_REF]{obj, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, obj, null, "+this.positions+R_DICNRNS+"}\n" + 
382
		"obj[FIELD_REF]{obj, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, obj, null, "+this.positions+R_DRICNRNS+"}\n" + 
383
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
383
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
384
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
384
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
385
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
385
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
386
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
386
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
387
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
387
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
388
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
388
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
389
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
389
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
390
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
390
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
391
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
391
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
392
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
392
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
393
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
393
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
394
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
394
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
395
		"BasicTestFields[METHOD_REF<CONSTRUCTOR>]{BasicTestFields(), Ljavadoc.fields.tags.BasicTestFields;, ()V, BasicTestFields, null, "+this.positions+JAVADOC_RELEVANCE+"}"
395
		"BasicTestFields[METHOD_REF<CONSTRUCTOR>]{BasicTestFields(), Ljavadoc.fields.tags.BasicTestFields;, ()V, BasicTestFields, null, "+this.positions+R_DRINR+"}"
396
	);
396
	);
397
}
397
}
398
398
Lines 409-428 Link Here
409
		"}";
409
		"}";
410
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "#", 0); // completion on empty token
410
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "#", 0); // completion on empty token
411
	assertResults(
411
	assertResults(
412
		"obj[FIELD_REF]{obj, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, obj, null, "+this.positions+R_DICNRNS+"}\n" + 
412
		"obj[FIELD_REF]{obj, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, obj, null, "+this.positions+R_DRICNRNS+"}\n" + 
413
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
413
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
414
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
414
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
415
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
415
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
416
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
416
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
417
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
417
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
418
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
418
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
419
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
419
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
420
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
420
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
421
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
421
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
422
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
422
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
423
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
423
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
424
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
424
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
425
		"BasicTestFields[METHOD_REF<CONSTRUCTOR>]{BasicTestFields(), Ljavadoc.fields.tags.BasicTestFields;, ()V, BasicTestFields, null, "+this.positions+JAVADOC_RELEVANCE+"}"
425
		"BasicTestFields[METHOD_REF<CONSTRUCTOR>]{BasicTestFields(), Ljavadoc.fields.tags.BasicTestFields;, ()V, BasicTestFields, null, "+this.positions+R_DRINR+"}"
426
	);
426
	);
427
}
427
}
428
428
Lines 439-458 Link Here
439
		"}";
439
		"}";
440
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "#", 0); // completion on empty token
440
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "#", 0); // completion on empty token
441
	assertResults(
441
	assertResults(
442
		"obj[FIELD_REF]{obj, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, obj, null, "+this.positions+R_DICNRNS+"}\n" + 
442
		"obj[FIELD_REF]{obj, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, obj, null, "+this.positions+R_DRICNRNS+"}\n" + 
443
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DICNRNS+"}\n" + 
443
		"foo[FIELD_REF]{foo, Ljavadoc.fields.tags.BasicTestFields;, I, foo, null, "+this.positions+R_DRICNRNS+"}\n" + 
444
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
444
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
445
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
445
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
446
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
446
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
447
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
447
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
448
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
448
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
449
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
449
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
450
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
450
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
451
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
451
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
452
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
452
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
453
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
453
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
454
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
454
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
455
		"BasicTestFields[METHOD_REF<CONSTRUCTOR>]{BasicTestFields(), Ljavadoc.fields.tags.BasicTestFields;, ()V, BasicTestFields, null, "+this.positions+JAVADOC_RELEVANCE+"}"
455
		"BasicTestFields[METHOD_REF<CONSTRUCTOR>]{BasicTestFields(), Ljavadoc.fields.tags.BasicTestFields;, ()V, BasicTestFields, null, "+this.positions+R_DRINR+"}"
456
	);
456
	);
457
}
457
}
458
458
Lines 484-490 Link Here
484
		"}";
484
		"}";
485
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "FIE");
485
	completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "FIE");
486
	assertResults(
486
	assertResults(
487
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DICNR+"}"
487
		"FIELD[FIELD_REF]{FIELD, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, I, FIELD, null, "+this.positions+R_DRICNR+"}"
488
	);
488
	);
489
}
489
}
490
/**
490
/**
Lines 510-516 Link Here
510
			"}";
510
			"}";
511
		completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "oTT");
511
		completeInJavadoc("/Completion/src/javadoc/fields/tags/BasicTestFields.java", source, true, "oTT");
512
		assertResults(
512
		assertResults(
513
			"oneTwoThree[FIELD_REF]{oneTwoThree, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, oneTwoThree, null, "+this.positions+"24}"
513
			"oneTwoThree[FIELD_REF]{oneTwoThree, Ljavadoc.fields.tags.BasicTestFields;, Ljava.lang.Object;, oneTwoThree, null, "+this.positions+"25}"
514
		);
514
		);
515
	} finally {
515
	} finally {
516
		JavaCore.setOptions(oldOptions);
516
		JavaCore.setOptions(oldOptions);
(-)src/org/eclipse/jdt/core/tests/model/CompletionTests.java (-1207 / +1563 lines)
Lines 65-71 Link Here
65
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
65
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
66
66
67
	assertResults(
67
	assertResults(
68
			"zzzzzz[FIELD_REF]{zzzzzz, Ltest.Test;, I, zzzzzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
68
			"zzzzzz[FIELD_REF]{zzzzzz, Ltest.Test;, I, zzzzzz, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
69
			requestor.getResults());
69
			requestor.getResults());
70
}
70
}
71
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
71
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164311
Lines 100-106 Link Here
100
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
100
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
101
101
102
	assertResults(
102
	assertResults(
103
			"zork[METHOD_REF]{zork(), Ltest.X;, ()V, zork, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
103
			"zork[METHOD_REF]{zork(), Ltest.X;, ()V, zork, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
104
			requestor.getResults());
104
			requestor.getResults());
105
}
105
}
106
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96213
106
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96213
Lines 128-134 Link Here
128
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
128
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
129
129
130
	assertResults(
130
	assertResults(
131
            "removed[LOCAL_VARIABLE_REF]{removed, null, I, removed, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
131
            "removed[LOCAL_VARIABLE_REF]{removed, null, I, removed, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
132
            requestor.getResults());
132
            requestor.getResults());
133
}
133
}
134
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99811
134
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=99811
Lines 185-192 Link Here
185
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
185
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
186
	
186
	
187
		assertResults(
187
		assertResults(
188
				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.Test;, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
188
				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.Test;, I, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
189
				"oTTField[FIELD_REF]{oTTField, Lcamelcase.Test;, I, oTTField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
189
				"oTTField[FIELD_REF]{oTTField, Lcamelcase.Test;, I, oTTField, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
190
				requestor.getResults());
190
				requestor.getResults());
191
	} finally {
191
	} finally {
192
		JavaCore.setOptions(oldOptions);
192
		JavaCore.setOptions(oldOptions);
Lines 219-226 Link Here
219
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
219
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
220
	
220
	
221
		assertResults(
221
		assertResults(
222
				"oneTwoThree[LOCAL_VARIABLE_REF]{oneTwoThree, null, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
222
				"oneTwoThree[LOCAL_VARIABLE_REF]{oneTwoThree, null, I, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
223
				"oTTLocal[LOCAL_VARIABLE_REF]{oTTLocal, null, I, oTTLocal, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
223
				"oTTLocal[LOCAL_VARIABLE_REF]{oTTLocal, null, I, oTTLocal, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
224
				requestor.getResults());
224
				requestor.getResults());
225
	} finally {
225
	} finally {
226
		JavaCore.setOptions(oldOptions);
226
		JavaCore.setOptions(oldOptions);
Lines 253-260 Link Here
253
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
253
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
254
	
254
	
255
		assertResults(
255
		assertResults(
256
				"oneTwoThree[METHOD_REF]{oneTwoThree(), Lcamelcase.Test;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
256
				"oneTwoThree[METHOD_REF]{oneTwoThree(), Lcamelcase.Test;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
257
				"oTTMethod[METHOD_REF]{oTTMethod(), Lcamelcase.Test;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
257
				"oTTMethod[METHOD_REF]{oTTMethod(), Lcamelcase.Test;, ()V, oTTMethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
258
				requestor.getResults());
258
				requestor.getResults());
259
	} finally {
259
	} finally {
260
		JavaCore.setOptions(oldOptions);
260
		JavaCore.setOptions(oldOptions);
Lines 291-299 Link Here
291
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
291
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
292
	
292
	
293
		assertResults(
293
		assertResults(
294
				"oTT[POTENTIAL_METHOD_DECLARATION]{oTT, Lcamelcase.Test;, ()V, oTT, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
294
				"oTT[POTENTIAL_METHOD_DECLARATION]{oTT, Lcamelcase.Test;, ()V, oTT, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
295
				"oneTwoThree[METHOD_DECLARATION]{public void oneTwoThree(), Lcamelcase.SuperClass;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
295
				"oneTwoThree[METHOD_DECLARATION]{public void oneTwoThree(), Lcamelcase.SuperClass;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
296
				"oTTMethod[METHOD_DECLARATION]{public void oTTMethod(), Lcamelcase.SuperClass;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
296
				"oTTMethod[METHOD_DECLARATION]{public void oTTMethod(), Lcamelcase.SuperClass;, ()V, oTTMethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
297
				requestor.getResults());
297
				requestor.getResults());
298
	} finally {
298
	} finally {
299
		JavaCore.setOptions(oldOptions);
299
		JavaCore.setOptions(oldOptions);
Lines 334-342 Link Here
334
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
334
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
335
	
335
	
336
		assertResults(
336
		assertResults(
337
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
337
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
338
				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
338
				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
339
				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
339
				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
340
				requestor.getResults());
340
				requestor.getResults());
341
	} finally {
341
	} finally {
342
		JavaCore.setOptions(oldOptions);
342
		JavaCore.setOptions(oldOptions);
Lines 377-384 Link Here
377
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
377
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
378
	
378
	
379
		assertResults(
379
		assertResults(
380
				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
380
				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
381
				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
381
				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
382
				requestor.getResults());
382
				requestor.getResults());
383
	} finally {
383
	} finally {
384
		JavaCore.setOptions(oldOptions);
384
		JavaCore.setOptions(oldOptions);
Lines 411-419 Link Here
411
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
411
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
412
	
412
	
413
		assertResults(
413
		assertResults(
414
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
414
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
415
				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
415
				"FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.FoFoFo;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
416
				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
416
				"FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.FFFTest;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
417
				requestor.getResults());
417
				requestor.getResults());
418
	} finally {
418
	} finally {
419
		JavaCore.setOptions(oldOptions);
419
		JavaCore.setOptions(oldOptions);
Lines 459-467 Link Here
459
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
459
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
460
	
460
	
461
		assertResults(
461
		assertResults(
462
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
462
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test;, ()V, FF, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
463
				"Member1.FoFoFo[TYPE_REF]{camelcase.Member1.FoFoFo, camelcase, Lcamelcase.Member1$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
463
				"Member1.FoFoFo[TYPE_REF]{camelcase.Member1.FoFoFo, camelcase, Lcamelcase.Member1$FoFoFo;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
464
				"Member2.FFFTest[TYPE_REF]{camelcase.Member2.FFFTest, camelcase, Lcamelcase.Member2$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
464
				"Member2.FFFTest[TYPE_REF]{camelcase.Member2.FFFTest, camelcase, Lcamelcase.Member2$FFFTest;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
465
				requestor.getResults());
465
				requestor.getResults());
466
	} finally {
466
	} finally {
467
		JavaCore.setOptions(oldOptions);
467
		JavaCore.setOptions(oldOptions);
Lines 494-502 Link Here
494
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
494
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
495
	
495
	
496
		assertResults(
496
		assertResults(
497
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test$FoFoFo$FFFTest;, ()V, FF, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
497
				"FF[POTENTIAL_METHOD_DECLARATION]{FF, Lcamelcase.Test$FoFoFo$FFFTest;, ()V, FF, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
498
				"Test.FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.Test$FoFoFo;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
498
				"Test.FoFoFo[TYPE_REF]{FoFoFo, camelcase, Lcamelcase.Test$FoFoFo;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
499
				"Test.FoFoFo.FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.Test$FoFoFo$FFFTest;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
499
				"Test.FoFoFo.FFFTest[TYPE_REF]{FFFTest, camelcase, Lcamelcase.Test$FoFoFo$FFFTest;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
500
				requestor.getResults());
500
				requestor.getResults());
501
	} finally {
501
	} finally {
502
		JavaCore.setOptions(oldOptions);
502
		JavaCore.setOptions(oldOptions);
Lines 547-554 Link Here
547
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
547
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
548
548
549
	assertResults(
549
	assertResults(
550
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
550
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
551
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
551
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
552
			requestor.getResults());
552
			requestor.getResults());
553
}
553
}
554
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
554
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 596-604 Link Here
596
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
596
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
597
597
598
	assertResults(
598
	assertResults(
599
			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
599
			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
600
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
600
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
601
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
601
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
602
			requestor.getResults());
602
			requestor.getResults());
603
}
603
}
604
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
604
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 647-655 Link Here
647
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
647
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
648
648
649
	assertResults(
649
	assertResults(
650
			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
650
			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
651
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
651
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
652
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
652
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
653
			requestor.getResults());
653
			requestor.getResults());
654
}
654
}
655
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
655
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 697-704 Link Here
697
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
697
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
698
698
699
	assertResults(
699
	assertResults(
700
			"IZZBException[TYPE_REF]{test.p.IZZBException, test.p, Ltest.p.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
700
			"IZZBException[TYPE_REF]{test.p.IZZBException, test.p, Ltest.p.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
701
			"IZZException[TYPE_REF]{test.p.IZZException, test.p, Ltest.p.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
701
			"IZZException[TYPE_REF]{test.p.IZZException, test.p, Ltest.p.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
702
			requestor.getResults());
702
			requestor.getResults());
703
}
703
}
704
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
704
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 731-738 Link Here
731
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
731
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
732
732
733
	assertResults(
733
	assertResults(
734
			"Test.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
734
			"Test.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
735
			"Test.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
735
			"Test.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
736
			requestor.getResults());
736
			requestor.getResults());
737
}
737
}
738
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
738
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 767-774 Link Here
767
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
767
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
768
768
769
	assertResults(
769
	assertResults(
770
			"Test.Inner.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$Inner$IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
770
			"Test.Inner.IZZBException[TYPE_REF]{IZZBException, test, Ltest.Test$Inner$IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
771
			"Test.Inner.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$Inner$IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
771
			"Test.Inner.IZZException[TYPE_REF]{IZZException, test, Ltest.Test$Inner$IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
772
			requestor.getResults());
772
			requestor.getResults());
773
}
773
}
774
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
774
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 805-812 Link Here
805
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
805
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
806
806
807
	assertResults(
807
	assertResults(
808
			"IZZBException[TYPE_REF]{IZZBException, test, LIZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
808
			"IZZBException[TYPE_REF]{IZZBException, test, LIZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
809
			"IZZException[TYPE_REF]{IZZException, test, LIZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
809
			"IZZException[TYPE_REF]{IZZException, test, LIZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
810
			requestor.getResults());
810
			requestor.getResults());
811
}
811
}
812
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
812
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 854-861 Link Here
854
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
854
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
855
855
856
	assertResults(
856
	assertResults(
857
			"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
857
			"Exception[TYPE_REF]{Exception, java.lang, Ljava.lang.Exception;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
858
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
858
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
859
			requestor.getResults());
859
			requestor.getResults());
860
}
860
}
861
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
861
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 914-922 Link Here
914
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
914
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
915
915
916
	assertResults(
916
	assertResults(
917
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
917
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
918
			"IZZCException[TYPE_REF]{IZZCException, test, Ltest.IZZCException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
918
			"IZZCException[TYPE_REF]{IZZCException, test, Ltest.IZZCException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
919
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
919
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
920
			requestor.getResults());
920
			requestor.getResults());
921
}
921
}
922
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
922
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 964-971 Link Here
964
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
964
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
965
965
966
	assertResults(
966
	assertResults(
967
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
967
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
968
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
968
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
969
			requestor.getResults());
969
			requestor.getResults());
970
}
970
}
971
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
971
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 1015-1022 Link Here
1015
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1015
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1016
1016
1017
	assertResults(
1017
	assertResults(
1018
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
1018
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
1019
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
1019
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
1020
			requestor.getResults());
1020
			requestor.getResults());
1021
}
1021
}
1022
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
1022
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 1061-1069 Link Here
1061
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1061
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1062
1062
1063
	assertResults(
1063
	assertResults(
1064
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
1064
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
1065
			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
1065
			"IZZAException[TYPE_REF]{IZZAException, test, Ltest.IZZAException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
1066
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
1066
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
1067
			requestor.getResults());
1067
			requestor.getResults());
1068
}
1068
}
1069
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
1069
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 1110-1117 Link Here
1110
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1110
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1111
1111
1112
	assertResults(
1112
	assertResults(
1113
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
1113
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}\n" +
1114
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
1114
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
1115
			requestor.getResults());
1115
			requestor.getResults());
1116
}
1116
}
1117
public void testCatchClauseExceptionRef13b() throws JavaModelException {
1117
public void testCatchClauseExceptionRef13b() throws JavaModelException {
Lines 1145-1151 Link Here
1145
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1145
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1146
1146
1147
	assertResults(
1147
	assertResults(
1148
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
1148
			"IZZBException[TYPE_REF]{IZZBException, test, Ltest.IZZBException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
1149
			requestor.getResults());
1149
			requestor.getResults());
1150
}
1150
}
1151
public void testCatchClauseExceptionRef14() throws JavaModelException {
1151
public void testCatchClauseExceptionRef14() throws JavaModelException {
Lines 1184-1190 Link Here
1184
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1184
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1185
	
1185
	
1186
		assertResults(
1186
		assertResults(
1187
				"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
1187
				"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_EXCEPTION + R_NON_RESTRICTED) + "}",
1188
				requestor.getResults());
1188
				requestor.getResults());
1189
	} finally {
1189
	} finally {
1190
		project.setOption(JavaCore.CODEASSIST_VISIBILITY_CHECK, visibilityCheck);
1190
		project.setOption(JavaCore.CODEASSIST_VISIBILITY_CHECK, visibilityCheck);
Lines 1230-1236 Link Here
1230
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1230
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1231
1231
1232
	assertResults(
1232
	assertResults(
1233
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
1233
			"IZZException[TYPE_REF]{IZZException, test, Ltest.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
1234
			requestor.getResults());
1234
			requestor.getResults());
1235
}
1235
}
1236
/*
1236
/*
Lines 1246-1252 Link Here
1246
	cu.codeComplete(cursorLocation, requestor);
1246
	cu.codeComplete(cursorLocation, requestor);
1247
1247
1248
	assertEquals(
1248
	assertEquals(
1249
			"element:method    completion:method()    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
1249
			"element:method    completion:method()    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
1250
			requestor.getResults());
1250
			requestor.getResults());
1251
}
1251
}
1252
public void testCompletionAbstractMethod1() throws JavaModelException {
1252
public void testCompletionAbstractMethod1() throws JavaModelException {
Lines 1298-1304 Link Here
1298
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1298
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1299
1299
1300
    assertResults(
1300
    assertResults(
1301
           "foo[METHOD_REF]{foo(), LCompletionAbstractMethod2$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
1301
           "foo[METHOD_REF]{foo(), LCompletionAbstractMethod2$A;, ()V, foo, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
1302
           requestor.getResults());
1302
           requestor.getResults());
1303
}
1303
}
1304
public void testCompletionAbstractMethod3() throws JavaModelException {
1304
public void testCompletionAbstractMethod3() throws JavaModelException {
Lines 1323-1329 Link Here
1323
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1323
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1324
1324
1325
    assertResults(
1325
    assertResults(
1326
           "foo[METHOD_REF]{foo(), LCompletionAbstractMethod3$A;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
1326
           "foo[METHOD_REF]{foo(), LCompletionAbstractMethod3$A;, ()V, foo, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
1327
           requestor.getResults());
1327
           requestor.getResults());
1328
}
1328
}
1329
public void testCompletionAbstractMethod4() throws JavaModelException {
1329
public void testCompletionAbstractMethod4() throws JavaModelException {
Lines 1384-1393 Link Here
1384
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1384
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1385
	
1385
	
1386
		assertResults(
1386
		assertResults(
1387
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionAbstractMethodRelevance1;, ()V, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
1387
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionAbstractMethodRelevance1;, ()V, foo, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
1388
			"foo1[METHOD_DECLARATION]{public void foo1(), LCompletionAbstractSuperClass;, ()V, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
1388
			"foo1[METHOD_DECLARATION]{public void foo1(), LCompletionAbstractSuperClass;, ()V, foo1, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
1389
			"foo3[METHOD_DECLARATION]{public void foo3(), LCompletionAbstractSuperClass;, ()V, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
1389
			"foo3[METHOD_DECLARATION]{public void foo3(), LCompletionAbstractSuperClass;, ()V, foo3, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
1390
			"foo2[METHOD_DECLARATION]{public void foo2(), LCompletionAbstractSuperClass;, ()V, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
1390
			"foo2[METHOD_DECLARATION]{public void foo2(), LCompletionAbstractSuperClass;, ()V, foo2, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
1391
			requestor.getResults());
1391
			requestor.getResults());
1392
	} finally {
1392
	} finally {
1393
		if(superClass != null) {
1393
		if(superClass != null) {
Lines 1421-1429 Link Here
1421
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1421
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1422
	
1422
	
1423
		assertResults(
1423
		assertResults(
1424
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionAbstractMethodRelevance2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
1424
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionAbstractMethodRelevance2;, ()V, eq, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
1425
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
1425
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
1426
			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
1426
			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
1427
			requestor.getResults());
1427
			requestor.getResults());
1428
	} finally {
1428
	} finally {
1429
		if(superClass != null) {
1429
		if(superClass != null) {
Lines 1441-1447 Link Here
1441
		cu.codeComplete(cursorLocation, requestor);
1441
		cu.codeComplete(cursorLocation, requestor);
1442
1442
1443
		assertEquals(
1443
		assertEquals(
1444
			"element:zzz    completion:zzz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1444
			"element:zzz    completion:zzz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1445
			requestor.getResults());
1445
			requestor.getResults());
1446
}
1446
}
1447
public void testCompletionAfterCase2() throws JavaModelException {
1447
public void testCompletionAfterCase2() throws JavaModelException {
Lines 1454-1460 Link Here
1454
		cu.codeComplete(cursorLocation, requestor);
1454
		cu.codeComplete(cursorLocation, requestor);
1455
1455
1456
		assertEquals(
1456
		assertEquals(
1457
			"element:zzz    completion:zzz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1457
			"element:zzz    completion:zzz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1458
			requestor.getResults());
1458
			requestor.getResults());
1459
}
1459
}
1460
public void testCompletionAfterSupercall1() throws JavaModelException {
1460
public void testCompletionAfterSupercall1() throws JavaModelException {
Lines 1483-1489 Link Here
1483
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1483
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1484
1484
1485
	assertResults(
1485
	assertResults(
1486
			"foo[METHOD_REF]{foo(), LCompletionAfterSupercall1_2;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
1486
			"foo[METHOD_REF]{foo(), LCompletionAfterSupercall1_2;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC+ R_NON_RESTRICTED) + "}",
1487
			requestor.getResults());
1487
			requestor.getResults());
1488
}
1488
}
1489
public void testCompletionAfterSwitch() throws JavaModelException {
1489
public void testCompletionAfterSwitch() throws JavaModelException {
Lines 1496-1502 Link Here
1496
	cu.codeComplete(cursorLocation, requestor);
1496
	cu.codeComplete(cursorLocation, requestor);
1497
1497
1498
	assertEquals(
1498
	assertEquals(
1499
			"element:bar    completion:bar()    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME+ R_NON_RESTRICTED),
1499
			"element:bar    completion:bar()    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME+ R_NON_RESTRICTED),
1500
			requestor.getResults());
1500
			requestor.getResults());
1501
}
1501
}
1502
public void testCompletionAllMemberTypes() throws JavaModelException {
1502
public void testCompletionAllMemberTypes() throws JavaModelException {
Lines 1523-1531 Link Here
1523
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1523
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1524
1524
1525
	assertResults(
1525
	assertResults(
1526
            "CompletionAllMemberTypes.Member1.Member2.Member3[TYPE_REF]{test.CompletionAllMemberTypes.Member1.Member2.Member3, test, Ltest.CompletionAllMemberTypes$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1526
            "CompletionAllMemberTypes.Member1.Member2.Member3[TYPE_REF]{test.CompletionAllMemberTypes.Member1.Member2.Member3, test, Ltest.CompletionAllMemberTypes$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1527
			"CompletionAllMemberTypes.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1527
			"CompletionAllMemberTypes.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1528
			"CompletionAllMemberTypes.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1528
			"CompletionAllMemberTypes.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes$Member1$Member2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1529
            requestor.getResults());
1529
            requestor.getResults());
1530
}
1530
}
1531
public void testCompletionAllMemberTypes2() throws JavaModelException {
1531
public void testCompletionAllMemberTypes2() throws JavaModelException {
Lines 1558-1569 Link Here
1558
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1558
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1559
1559
1560
	assertResults(
1560
	assertResults(
1561
            "CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1561
            "CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1562
			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1562
			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1563
			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1563
			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1564
			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1564
			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1565
			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1565
			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1566
			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1566
			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1567
            requestor.getResults());
1567
            requestor.getResults());
1568
}
1568
}
1569
public void testCompletionAllMemberTypes3() throws JavaModelException {
1569
public void testCompletionAllMemberTypes3() throws JavaModelException {
Lines 1594-1606 Link Here
1594
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1594
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1595
1595
1596
	assertResults(
1596
	assertResults(
1597
            "Member[POTENTIAL_METHOD_DECLARATION]{Member, Ltest.CompletionAllMemberTypes2$Member1$Member2;, ()V, Member, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
1597
            "Member[POTENTIAL_METHOD_DECLARATION]{Member, Ltest.CompletionAllMemberTypes2$Member1$Member2;, ()V, Member, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
1598
			"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1598
			"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1599
			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1599
			"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1600
			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1600
			"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1601
			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1601
			"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1602
			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1602
			"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1603
			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1603
			"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1604
            requestor.getResults());
1604
            requestor.getResults());
1605
}
1605
}
1606
public void testCompletionAllMemberTypes4() throws JavaModelException {
1606
public void testCompletionAllMemberTypes4() throws JavaModelException {
Lines 1654-1671 Link Here
1654
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1654
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1655
	
1655
	
1656
    	assertResults(
1656
    	assertResults(
1657
	            "AnInterface.Member1.Member2[TYPE_REF]{test.AnInterface.Member1.Member2, test, Ltest.AnInterface$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1657
	            "AnInterface.Member1.Member2[TYPE_REF]{test.AnInterface.Member1.Member2, test, Ltest.AnInterface$Member1$Member2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1658
				"AnInterface.Member1.Member2.Member3[TYPE_REF]{test.AnInterface.Member1.Member2.Member3, test, Ltest.AnInterface$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1658
				"AnInterface.Member1.Member2.Member3[TYPE_REF]{test.AnInterface.Member1.Member2.Member3, test, Ltest.AnInterface$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1659
				"AnInterface.Member1.Member2.Member3.Member4[TYPE_REF]{test.AnInterface.Member1.Member2.Member3.Member4, test, Ltest.AnInterface$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1659
				"AnInterface.Member1.Member2.Member3.Member4[TYPE_REF]{test.AnInterface.Member1.Member2.Member3.Member4, test, Ltest.AnInterface$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1660
				"AnInterface.Member1.Member5[TYPE_REF]{test.AnInterface.Member1.Member5, test, Ltest.AnInterface$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1660
				"AnInterface.Member1.Member5[TYPE_REF]{test.AnInterface.Member1.Member5, test, Ltest.AnInterface$Member1$Member5;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1661
				"AnInterface.Member1.Member5.Member6[TYPE_REF]{test.AnInterface.Member1.Member5.Member6, test, Ltest.AnInterface$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1661
				"AnInterface.Member1.Member5.Member6[TYPE_REF]{test.AnInterface.Member1.Member5.Member6, test, Ltest.AnInterface$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1662
				"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1662
				"CompletionAllMemberTypes2.Member1.Member2.Member3.Member4[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member2.Member3.Member4, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1663
				"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1663
				"CompletionAllMemberTypes2.Member1.Member5.Member6[TYPE_REF]{test.CompletionAllMemberTypes2.Member1.Member5.Member6, test, Ltest.CompletionAllMemberTypes2$Member1$Member5$Member6;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1664
				"AnInterface.Member1[TYPE_REF]{Member1, test, Ltest.AnInterface$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1664
				"AnInterface.Member1[TYPE_REF]{Member1, test, Ltest.AnInterface$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1665
				"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1665
				"CompletionAllMemberTypes2.Member1[TYPE_REF]{Member1, test, Ltest.CompletionAllMemberTypes2$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1666
				"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1666
				"CompletionAllMemberTypes2.Member1.Member2[TYPE_REF]{Member2, test, Ltest.CompletionAllMemberTypes2$Member1$Member2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1667
				"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1667
				"CompletionAllMemberTypes2.Member1.Member2.Member3[TYPE_REF]{Member3, test, Ltest.CompletionAllMemberTypes2$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1668
				"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1668
				"CompletionAllMemberTypes2.Member1.Member5[TYPE_REF]{Member5, test, Ltest.CompletionAllMemberTypes2$Member1$Member5;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1669
	            requestor.getResults());
1669
	            requestor.getResults());
1670
	} finally {
1670
	} finally {
1671
		if(anInterface != null) {
1671
		if(anInterface != null) {
Lines 1715-1723 Link Here
1715
    	// AType.Member1.Member2.Member3 and AType.Member1.Member2.Member3.Member4 should not be proposed because they are not visible.
1715
    	// AType.Member1.Member2.Member3 and AType.Member1.Member2.Member3.Member4 should not be proposed because they are not visible.
1716
    	// But visibility need modifiers of enclosing types to be computed. 
1716
    	// But visibility need modifiers of enclosing types to be computed. 
1717
    	assertResults(
1717
    	assertResults(
1718
	            "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1718
	            "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1719
				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1719
				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1720
				"AType.Member1.Member2.Member3.Member4[TYPE_REF]{test.AType.Member1.Member2.Member3.Member4, test, Ltest.AType$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1720
				"AType.Member1.Member2.Member3.Member4[TYPE_REF]{test.AType.Member1.Member2.Member3.Member4, test, Ltest.AType$Member1$Member2$Member3$Member4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1721
	            requestor.getResults());
1721
	            requestor.getResults());
1722
	} finally {
1722
	} finally {
1723
		if(aType != null) {
1723
		if(aType != null) {
Lines 1759-1765 Link Here
1759
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1759
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1760
	
1760
	
1761
    	assertResults(
1761
    	assertResults(
1762
	            "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1762
	            "AType.Member1[TYPE_REF]{test.AType.Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1763
	            requestor.getResults());
1763
	            requestor.getResults());
1764
	} finally {
1764
	} finally {
1765
		JavaCore.setOptions(oldCurrentOptions);
1765
		JavaCore.setOptions(oldCurrentOptions);
Lines 1796-1804 Link Here
1796
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1796
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1797
	
1797
	
1798
    	assertResults(
1798
    	assertResults(
1799
	            "AType.Member1.Member2[TYPE_REF]{test.AType.Member1.Member2, test, Ltest.AType$Member1$Member2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1799
	            "AType.Member1.Member2[TYPE_REF]{test.AType.Member1.Member2, test, Ltest.AType$Member1$Member2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1800
				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1800
				"AType.Member1.Member2.Member3[TYPE_REF]{test.AType.Member1.Member2.Member3, test, Ltest.AType$Member1$Member2$Member3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1801
				"AType.Member1[TYPE_REF]{Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1801
				"AType.Member1[TYPE_REF]{Member1, test, Ltest.AType$Member1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1802
	            requestor.getResults());
1802
	            requestor.getResults());
1803
	} finally {
1803
	} finally {
1804
		JavaCore.setOptions(oldCurrentOptions);
1804
		JavaCore.setOptions(oldCurrentOptions);
Lines 1815-1825 Link Here
1815
	cu.codeComplete(cursorLocation, requestor);
1815
	cu.codeComplete(cursorLocation, requestor);
1816
1816
1817
	assertEquals(
1817
	assertEquals(
1818
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1818
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1819
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1819
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1820
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1820
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1821
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1821
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1822
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1822
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1823
		requestor.getResults());
1823
		requestor.getResults());
1824
}
1824
}
1825
public void testCompletionAllocationExpressionIsParent2() throws JavaModelException {
1825
public void testCompletionAllocationExpressionIsParent2() throws JavaModelException {
Lines 1851-1861 Link Here
1851
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1851
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1852
1852
1853
    assertResults(
1853
    assertResults(
1854
            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent2;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1854
            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent2;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1855
            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent2;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1855
            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent2;, Z, zzboolean, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1856
            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent2;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1856
            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent2;, D, zzdouble, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1857
            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent2;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1857
            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent2;, I, zzint, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1858
            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent2;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
1858
            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent2;, J, zzlong, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
1859
            requestor.getResults());
1859
            requestor.getResults());
1860
}
1860
}
1861
1861
Lines 1888-1898 Link Here
1888
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1888
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1889
1889
1890
    assertResults(
1890
    assertResults(
1891
            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent3;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1891
            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent3;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1892
            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent3;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1892
            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent3;, Z, zzboolean, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1893
            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent3;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1893
            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent3;, D, zzdouble, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1894
            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent3;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1894
            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent3;, I, zzint, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1895
            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent3;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
1895
            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent3;, J, zzlong, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
1896
            requestor.getResults());
1896
            requestor.getResults());
1897
}
1897
}
1898
1898
Lines 1906-1916 Link Here
1906
	cu.codeComplete(cursorLocation, requestor);
1906
	cu.codeComplete(cursorLocation, requestor);
1907
1907
1908
	assertEquals(
1908
	assertEquals(
1909
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1909
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1910
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1910
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1911
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1911
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1912
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1912
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1913
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1913
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1914
		requestor.getResults());
1914
		requestor.getResults());
1915
}
1915
}
1916
1916
Lines 1924-1934 Link Here
1924
	cu.codeComplete(cursorLocation, requestor);
1924
	cu.codeComplete(cursorLocation, requestor);
1925
1925
1926
	assertEquals(
1926
	assertEquals(
1927
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1927
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1928
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1928
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1929
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1929
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1930
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1930
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
1931
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1931
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1932
		requestor.getResults());
1932
		requestor.getResults());
1933
}
1933
}
1934
1934
Lines 1964-1974 Link Here
1964
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1964
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1965
1965
1966
    assertResults(
1966
    assertResults(
1967
            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent6;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1967
            "zzObject[FIELD_REF]{zzObject, LCompletionAllocationExpressionIsParent6;, Ljava.lang.Object;, zzObject, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1968
            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent6;, Z, zzboolean, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1968
            "zzboolean[FIELD_REF]{zzboolean, LCompletionAllocationExpressionIsParent6;, Z, zzboolean, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1969
            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent6;, D, zzdouble, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1969
            "zzdouble[FIELD_REF]{zzdouble, LCompletionAllocationExpressionIsParent6;, D, zzdouble, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1970
            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent6;, I, zzint, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1970
            "zzint[FIELD_REF]{zzint, LCompletionAllocationExpressionIsParent6;, I, zzint, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
1971
            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent6;, J, zzlong, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
1971
            "zzlong[FIELD_REF]{zzlong, LCompletionAllocationExpressionIsParent6;, J, zzlong, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
1972
            requestor.getResults());
1972
            requestor.getResults());
1973
}
1973
}
1974
1974
Lines 1984-1991 Link Here
1984
1984
1985
	assertEquals(
1985
	assertEquals(
1986
		"should have two completions", 
1986
		"should have two completions", 
1987
		"element:xBar    completion:this.xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
1987
		"element:xBar    completion:this.xBar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
1988
		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1988
		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
1989
		requestor.getResults());
1989
		requestor.getResults());
1990
}
1990
}
1991
1991
Lines 2009-2016 Link Here
2009
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
2009
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
2010
2010
2011
    assertResults(
2011
    assertResults(
2012
            "xBar[FIELD_REF]{CompletionAmbiguousFieldName2.this.xBar, LCompletionAmbiguousFieldName2;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
2012
            "xBar[FIELD_REF]{CompletionAmbiguousFieldName2.this.xBar, LCompletionAmbiguousFieldName2;, I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
2013
            "xBar[LOCAL_VARIABLE_REF]{xBar, null, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
2013
            "xBar[LOCAL_VARIABLE_REF]{xBar, null, I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
2014
            requestor.getResults());
2014
            requestor.getResults());
2015
}
2015
}
2016
2016
Lines 2026-2033 Link Here
2026
2026
2027
	assertEquals(
2027
	assertEquals(
2028
		"should have two completions", 
2028
		"should have two completions", 
2029
		"element:xBar    completion:ClassFoo.this.xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
2029
		"element:xBar    completion:ClassFoo.this.xBar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
2030
		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2030
		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2031
		requestor.getResults());
2031
		requestor.getResults());
2032
}
2032
}
2033
public void testCompletionAmbiguousFieldName4() throws JavaModelException {
2033
public void testCompletionAmbiguousFieldName4() throws JavaModelException {
Lines 2042-2048 Link Here
2042
2042
2043
	assertEquals(
2043
	assertEquals(
2044
		"should have one completion", 
2044
		"should have one completion", 
2045
		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2045
		"element:xBar    completion:xBar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2046
		requestor.getResults());
2046
		requestor.getResults());
2047
}
2047
}
2048
public void testCompletionAmbiguousType() throws JavaModelException {
2048
public void testCompletionAmbiguousType() throws JavaModelException {
Lines 2056-2063 Link Here
2056
2056
2057
	assertEquals(
2057
	assertEquals(
2058
		"should have two completions", 
2058
		"should have two completions", 
2059
		"element:ABC    completion:p1.ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n" +
2059
		"element:ABC    completion:p1.ABC    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n" +
2060
		"element:ABC    completion:p2.ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
2060
		"element:ABC    completion:p2.ABC    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
2061
		requestor.getResults());
2061
		requestor.getResults());
2062
}
2062
}
2063
public void testCompletionAmbiguousType2() throws JavaModelException {
2063
public void testCompletionAmbiguousType2() throws JavaModelException {
Lines 2071-2078 Link Here
2071
2071
2072
	assertEquals(
2072
	assertEquals(
2073
		"should have two completions", 
2073
		"should have two completions", 
2074
		"element:ABC    completion:ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2074
		"element:ABC    completion:ABC    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2075
		"element:ABC    completion:p2.ABC    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
2075
		"element:ABC    completion:p2.ABC    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
2076
		requestor.getResults());
2076
		requestor.getResults());
2077
}
2077
}
2078
2078
Lines 2104-2111 Link Here
2104
	cu.codeComplete(cursorLocation, requestor);
2104
	cu.codeComplete(cursorLocation, requestor);
2105
2105
2106
	assertEquals(
2106
	assertEquals(
2107
		"element:zzz1    completion:zzz1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2107
		"element:zzz1    completion:zzz1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2108
		"element:zzz2    completion:zzz2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE +R_UNQUALIFIED+ R_NON_RESTRICTED),
2108
		"element:zzz2    completion:zzz2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE +R_UNQUALIFIED+ R_NON_RESTRICTED),
2109
		requestor.getResults());
2109
		requestor.getResults());
2110
}
2110
}
2111
2111
Lines 2129-2135 Link Here
2129
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
2129
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
2130
2130
2131
    assertResults(
2131
    assertResults(
2132
            "clone[METHOD_REF]{clone(), [J, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
2132
            "clone[METHOD_REF]{clone(), [J, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
2133
            requestor.getResults());
2133
            requestor.getResults());
2134
}
2134
}
2135
2135
Lines 2153-2159 Link Here
2153
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
2153
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
2154
2154
2155
    assertResults(
2155
    assertResults(
2156
            "length[FIELD_REF]{length, [J, I, length, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2156
            "length[FIELD_REF]{length, [J, I, length, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2157
            requestor.getResults());
2157
            requestor.getResults());
2158
}
2158
}
2159
2159
Lines 2167-2173 Link Here
2167
	cu.codeComplete(cursorLocation, requestor);
2167
	cu.codeComplete(cursorLocation, requestor);
2168
2168
2169
	assertEquals(
2169
	assertEquals(
2170
		"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
2170
		"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
2171
		requestor.getResults());
2171
		requestor.getResults());
2172
}
2172
}
2173
2173
Lines 2181-2191 Link Here
2181
	cu.codeComplete(cursorLocation, requestor);
2181
	cu.codeComplete(cursorLocation, requestor);
2182
2182
2183
	assertEquals(
2183
	assertEquals(
2184
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2184
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2185
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2185
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2186
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2186
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2187
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2187
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2188
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2188
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2189
		requestor.getResults());
2189
		requestor.getResults());
2190
}
2190
}
2191
2191
Lines 2199-2209 Link Here
2199
	cu.codeComplete(cursorLocation, requestor);
2199
	cu.codeComplete(cursorLocation, requestor);
2200
2200
2201
	assertEquals(
2201
	assertEquals(
2202
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2202
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2203
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2203
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2204
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2204
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2205
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2205
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2206
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2206
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2207
		requestor.getResults());
2207
		requestor.getResults());
2208
}
2208
}
2209
2209
Lines 2217-2223 Link Here
2217
	cu.codeComplete(cursorLocation, requestor);
2217
	cu.codeComplete(cursorLocation, requestor);
2218
2218
2219
	assertEquals(
2219
	assertEquals(
2220
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2220
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2221
		requestor.getResults());
2221
		requestor.getResults());
2222
}
2222
}
2223
2223
Lines 2232-2238 Link Here
2232
	cu.codeComplete(cursorLocation, requestor);
2232
	cu.codeComplete(cursorLocation, requestor);
2233
2233
2234
	assertEquals(
2234
	assertEquals(
2235
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2235
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2236
		requestor.getResults());
2236
		requestor.getResults());
2237
}
2237
}
2238
2238
Lines 2253-2260 Link Here
2253
			result.context);
2253
			result.context);
2254
	
2254
	
2255
	assertResults(
2255
	assertResults(
2256
			"Object[ANONYMOUS_CLASS_DECLARATION]{, Ljava.lang.Object;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
2256
			"Object[ANONYMOUS_CLASS_DECLARATION]{, Ljava.lang.Object;, ()V, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
2257
			"Object[METHOD_REF<CONSTRUCTOR>]{, Ljava.lang.Object;, ()V, Object, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
2257
			"Object[METHOD_REF<CONSTRUCTOR>]{, Ljava.lang.Object;, ()V, Object, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
2258
			result.proposals);
2258
			result.proposals);
2259
}
2259
}
2260
2260
Lines 2276-2282 Link Here
2276
			result.context);
2276
			result.context);
2277
	
2277
	
2278
	assertResults(
2278
	assertResults(
2279
			"zzz[LOCAL_VARIABLE_REF]{zzz, null, Ljava.lang.String;, zzz, null, " + (R_DEFAULT + R_INTERESTING + R_CASE +  + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2279
			"zzz[LOCAL_VARIABLE_REF]{zzz, null, Ljava.lang.String;, zzz, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE +  + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2280
			result.proposals);
2280
			result.proposals);
2281
}
2281
}
2282
2282
Lines 2290-2296 Link Here
2290
	cu.codeComplete(cursorLocation, requestor);
2290
	cu.codeComplete(cursorLocation, requestor);
2291
2291
2292
	assertResults(
2292
	assertResults(
2293
			"zzvarzz[FIELD_REF]{zzvarzz, LCompletionBasicField1;, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2293
			"zzvarzz[FIELD_REF]{zzvarzz, LCompletionBasicField1;, I, zzvarzz, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2294
			requestor.getResults());
2294
			requestor.getResults());
2295
}
2295
}
2296
2296
Lines 2304-2310 Link Here
2304
	cu.codeComplete(cursorLocation, requestor);
2304
	cu.codeComplete(cursorLocation, requestor);
2305
2305
2306
	assertResults(
2306
	assertResults(
2307
			"while[KEYWORD]{while, null, null, while, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2307
			"while[KEYWORD]{while, null, null, while, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2308
			requestor.getResults());
2308
			requestor.getResults());
2309
}
2309
}
2310
2310
Lines 2318-2324 Link Here
2318
	cu.codeComplete(cursorLocation, requestor);
2318
	cu.codeComplete(cursorLocation, requestor);
2319
2319
2320
	assertResults(
2320
	assertResults(
2321
			"zzvarzz[LOCAL_VARIABLE_REF]{zzvarzz, null, I, zzvarzz, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2321
			"zzvarzz[LOCAL_VARIABLE_REF]{zzvarzz, null, I, zzvarzz, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2322
			requestor.getResults());
2322
			requestor.getResults());
2323
}
2323
}
2324
2324
Lines 2332-2338 Link Here
2332
	cu.codeComplete(cursorLocation, requestor);
2332
	cu.codeComplete(cursorLocation, requestor);
2333
2333
2334
	assertResults(
2334
	assertResults(
2335
			"zzfoo[METHOD_REF]{zzfoo(), LCompletionBasicMethod1;, ()V, zzfoo, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2335
			"zzfoo[METHOD_REF]{zzfoo(), LCompletionBasicMethod1;, ()V, zzfoo, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2336
			requestor.getResults());
2336
			requestor.getResults());
2337
}
2337
}
2338
2338
Lines 2346-2353 Link Here
2346
	cu.codeComplete(cursorLocation, requestor);
2346
	cu.codeComplete(cursorLocation, requestor);
2347
2347
2348
	assertResults(
2348
	assertResults(
2349
			"equals[POTENTIAL_METHOD_DECLARATION]{equals, LCompletionBasicMethodDeclaration1;, ()V, equals, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
2349
			"equals[POTENTIAL_METHOD_DECLARATION]{equals, LCompletionBasicMethodDeclaration1;, ()V, equals, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
2350
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
2350
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
2351
			requestor.getResults());
2351
			requestor.getResults());
2352
}
2352
}
2353
2353
Lines 2361-2367 Link Here
2361
	cu.codeComplete(cursorLocation, requestor);
2361
	cu.codeComplete(cursorLocation, requestor);
2362
2362
2363
	assertResults(
2363
	assertResults(
2364
			"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "}",
2364
			"java.lang[PACKAGE_REF]{java.lang, java.lang, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "}",
2365
			requestor.getResults());
2365
			requestor.getResults());
2366
}
2366
}
2367
2367
Lines 2376-2382 Link Here
2376
	cu.codeComplete(cursorLocation, requestor);
2376
	cu.codeComplete(cursorLocation, requestor);
2377
2377
2378
	assertResults(
2378
	assertResults(
2379
			"zzpot[POTENTIAL_METHOD_DECLARATION]{zzpot, LCompletionBasicPotentialMethodDeclaration1;, ()V, zzpot, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
2379
			"zzpot[POTENTIAL_METHOD_DECLARATION]{zzpot, LCompletionBasicPotentialMethodDeclaration1;, ()V, zzpot, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
2380
			requestor.getResults());
2380
			requestor.getResults());
2381
}
2381
}
2382
2382
Lines 2391-2397 Link Here
2391
	cu.codeComplete(cursorLocation, requestor);
2391
	cu.codeComplete(cursorLocation, requestor);
2392
2392
2393
	assertResults(
2393
	assertResults(
2394
			"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2394
			"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2395
			requestor.getResults());
2395
			requestor.getResults());
2396
}
2396
}
2397
2397
Lines 2424-2433 Link Here
2424
		cu.codeComplete(cursorLocation, requestor);
2424
		cu.codeComplete(cursorLocation, requestor);
2425
2425
2426
		assertEquals(
2426
		assertEquals(
2427
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2427
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2428
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2428
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2429
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2429
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2430
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
2430
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
2431
			requestor.getResults());
2431
			requestor.getResults());
2432
}
2432
}
2433
2433
Lines 2441-2449 Link Here
2441
		cu.codeComplete(cursorLocation, requestor);
2441
		cu.codeComplete(cursorLocation, requestor);
2442
2442
2443
		assertEquals(
2443
		assertEquals(
2444
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2444
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2445
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2445
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2446
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2446
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2447
			requestor.getResults());
2447
			requestor.getResults());
2448
}
2448
}
2449
2449
Lines 2458-2466 Link Here
2458
		cu.codeComplete(cursorLocation, requestor);
2458
		cu.codeComplete(cursorLocation, requestor);
2459
2459
2460
		assertEquals(
2460
		assertEquals(
2461
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2461
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2462
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2462
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2463
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2463
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2464
			requestor.getResults());
2464
			requestor.getResults());
2465
}
2465
}
2466
2466
Lines 2478-2484 Link Here
2478
	cu.codeComplete(cursorLocation, requestor);
2478
	cu.codeComplete(cursorLocation, requestor);
2479
	
2479
	
2480
	assertEquals("should have one class",
2480
	assertEquals("should have one class",
2481
		"element:field    completion:field    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_STATIC + R_NON_RESTRICTED),
2481
		"element:field    completion:field    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_STATIC + R_NON_RESTRICTED),
2482
		requestor.getResults());
2482
		requestor.getResults());
2483
}
2483
}
2484
2484
Lines 2497-2507 Link Here
2497
	cu.codeComplete(cursorLocation, requestor);
2497
	cu.codeComplete(cursorLocation, requestor);
2498
	assertEquals(
2498
	assertEquals(
2499
		"should have package completions",
2499
		"should have package completions",
2500
		"element:jarpack1    completion:jarpack1    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
2500
		"element:jarpack1    completion:jarpack1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
2501
		"element:jarpack2    completion:jarpack2    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
2501
		"element:jarpack2    completion:jarpack2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING+ R_NON_RESTRICTED)+"\n" +
2502
		"element:java    completion:java    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
2502
		"element:java    completion:java    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
2503
		"element:java.io    completion:java.io    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
2503
		"element:java.io    completion:java.io    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"\n" +
2504
		"element:java.lang    completion:java.lang    relevance:"+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED),
2504
		"element:java.lang    completion:java.lang    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED),
2505
		requestor.getResults());
2505
		requestor.getResults());
2506
}
2506
}
2507
2507
Lines 2516-2541 Link Here
2516
	cu.codeComplete(cursorLocation, requestor);
2516
	cu.codeComplete(cursorLocation, requestor);
2517
2517
2518
	assertEquals(
2518
	assertEquals(
2519
		"element:zz00    completion:zz00    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2519
		"element:zz00    completion:zz00    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2520
		"element:zz00M    completion:zz00M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2520
		"element:zz00M    completion:zz00M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2521
		"element:zz01    completion:zz01    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2521
		"element:zz01    completion:zz01    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2522
		"element:zz01M    completion:zz01M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2522
		"element:zz01M    completion:zz01M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2523
		"element:zz02    completion:zz02    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2523
		"element:zz02    completion:zz02    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2524
		"element:zz02M    completion:zz02M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2524
		"element:zz02M    completion:zz02M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2525
		"element:zz10    completion:zz10    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2525
		"element:zz10    completion:zz10    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2526
		"element:zz10M    completion:zz10M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2526
		"element:zz10M    completion:zz10M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2527
		"element:zz11    completion:zz11    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2527
		"element:zz11    completion:zz11    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2528
		"element:zz11M    completion:zz11M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2528
		"element:zz11M    completion:zz11M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2529
		"element:zz12    completion:zz12    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2529
		"element:zz12    completion:zz12    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2530
		"element:zz12M    completion:zz12M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2530
		"element:zz12M    completion:zz12M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2531
		"element:zz20    completion:zz20    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2531
		"element:zz20    completion:zz20    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2532
		"element:zz20M    completion:zz20M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2532
		"element:zz20M    completion:zz20M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2533
		"element:zz21    completion:zz21    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2533
		"element:zz21    completion:zz21    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2534
		"element:zz21M    completion:zz21M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2534
		"element:zz21M    completion:zz21M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2535
		"element:zz22    completion:zz22    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2535
		"element:zz22    completion:zz22    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2536
		"element:zz22M    completion:zz22M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2536
		"element:zz22M    completion:zz22M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2537
		"element:zzOb    completion:zzOb    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2537
		"element:zzOb    completion:zzOb    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2538
		"element:zzObM    completion:zzObM()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2538
		"element:zzObM    completion:zzObM()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2539
		requestor.getResults());
2539
		requestor.getResults());
2540
}
2540
}
2541
2541
Lines 2550-2564 Link Here
2550
	cu.codeComplete(cursorLocation, requestor);
2550
	cu.codeComplete(cursorLocation, requestor);
2551
2551
2552
	assertEquals(
2552
	assertEquals(
2553
		"element:XX00    completion:XX00    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2553
		"element:XX00    completion:XX00    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2554
		"element:XX01    completion:XX01    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2554
		"element:XX01    completion:XX01    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2555
		"element:XX02    completion:XX02    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2555
		"element:XX02    completion:XX02    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2556
		"element:XX10    completion:XX10    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2556
		"element:XX10    completion:XX10    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2557
		"element:XX11    completion:XX11    relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2557
		"element:XX11    completion:XX11    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2558
		"element:XX12    completion:XX12    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2558
		"element:XX12    completion:XX12    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2559
		"element:XX20    completion:XX20    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2559
		"element:XX20    completion:XX20    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2560
		"element:XX21    completion:XX21    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2560
		"element:XX21    completion:XX21    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2561
		"element:XX22    completion:XX22    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
2561
		"element:XX22    completion:XX22    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
2562
		requestor.getResults());
2562
		requestor.getResults());
2563
}
2563
}
2564
2564
Lines 2625-2631 Link Here
2625
	cu.codeComplete(cursorLocation, requestor);
2625
	cu.codeComplete(cursorLocation, requestor);
2626
2626
2627
	assertEquals(
2627
	assertEquals(
2628
		"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
2628
		"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
2629
		requestor.getResults());
2629
		requestor.getResults());
2630
}
2630
}
2631
2631
Lines 2639-2648 Link Here
2639
		cu.codeComplete(cursorLocation, requestor);
2639
		cu.codeComplete(cursorLocation, requestor);
2640
2640
2641
		assertEquals(
2641
		assertEquals(
2642
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2642
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2643
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2643
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2644
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2644
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2645
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2645
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2646
			requestor.getResults());
2646
			requestor.getResults());
2647
}
2647
}
2648
2648
Lines 2656-2665 Link Here
2656
		cu.codeComplete(cursorLocation, requestor);
2656
		cu.codeComplete(cursorLocation, requestor);
2657
2657
2658
		assertEquals(
2658
		assertEquals(
2659
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2659
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2660
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2660
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2661
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2661
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2662
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2662
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2663
			requestor.getResults());
2663
			requestor.getResults());
2664
}
2664
}
2665
2665
Lines 2673-2682 Link Here
2673
		cu.codeComplete(cursorLocation, requestor);
2673
		cu.codeComplete(cursorLocation, requestor);
2674
2674
2675
		assertEquals(
2675
		assertEquals(
2676
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2676
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2677
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2677
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2678
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2678
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2679
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2679
			"element:var4    completion:var4    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2680
			requestor.getResults());
2680
			requestor.getResults());
2681
}
2681
}
2682
2682
Lines 2694-2700 Link Here
2694
	cu.codeComplete(cursorLocation, requestor);
2694
	cu.codeComplete(cursorLocation, requestor);
2695
2695
2696
	assertEquals(
2696
	assertEquals(
2697
		"element:TypeWithConstructor    completion:    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
2697
		"element:TypeWithConstructor    completion:    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING+ R_NON_RESTRICTED),
2698
		requestor.getResults());
2698
		requestor.getResults());
2699
}
2699
}
2700
2700
Lines 2712-2747 Link Here
2712
2712
2713
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2713
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2714
		assertEquals(
2714
		assertEquals(
2715
			"element:clone    completion:clone()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2715
			"element:clone    completion:clone()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2716
			"element:equals    completion:equals()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2716
			"element:equals    completion:equals()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2717
			"element:finalize    completion:finalize()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2717
			"element:finalize    completion:finalize()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2718
			"element:foo    completion:foo()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2718
			"element:foo    completion:foo()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2719
			"element:getClass    completion:getClass()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2719
			"element:getClass    completion:getClass()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2720
			"element:hashCode    completion:hashCode()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2720
			"element:hashCode    completion:hashCode()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2721
			"element:notify    completion:notify()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2721
			"element:notify    completion:notify()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2722
			"element:notifyAll    completion:notifyAll()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2722
			"element:notifyAll    completion:notifyAll()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2723
			"element:toString    completion:toString()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2723
			"element:toString    completion:toString()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2724
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2724
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2725
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2725
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2726
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2726
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2727
			"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2727
			"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2728
			requestor.getResultsWithPosition());
2728
			requestor.getResultsWithPosition());
2729
	} else {
2729
	} else {
2730
		assertEquals(
2730
		assertEquals(
2731
			"element:CompletionEmptyToken1    completion:CompletionEmptyToken1    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2731
			"element:CompletionEmptyToken1    completion:CompletionEmptyToken1    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2732
			"element:clone    completion:clone()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2732
			"element:clone    completion:clone()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2733
			"element:equals    completion:equals()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2733
			"element:equals    completion:equals()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2734
			"element:finalize    completion:finalize()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2734
			"element:finalize    completion:finalize()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2735
			"element:foo    completion:foo()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2735
			"element:foo    completion:foo()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2736
			"element:getClass    completion:getClass()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2736
			"element:getClass    completion:getClass()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2737
			"element:hashCode    completion:hashCode()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2737
			"element:hashCode    completion:hashCode()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2738
			"element:notify    completion:notify()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2738
			"element:notify    completion:notify()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2739
			"element:notifyAll    completion:notifyAll()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2739
			"element:notifyAll    completion:notifyAll()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2740
			"element:toString    completion:toString()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2740
			"element:toString    completion:toString()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2741
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2741
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2742
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2742
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2743
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2743
			"element:wait    completion:wait()    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
2744
			"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2744
			"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2745
			requestor.getResultsWithPosition());
2745
			requestor.getResultsWithPosition());
2746
	}
2746
	}
2747
}
2747
}
Lines 2767-2773 Link Here
2767
            requestor.getContext());
2767
            requestor.getContext());
2768
    
2768
    
2769
	assertResults(
2769
	assertResults(
2770
            "testCompletionEmptyToken2[PACKAGE_REF]{testCompletionEmptyToken2, testCompletionEmptyToken2, null, null, null, ["+start+", "+end+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
2770
            "testCompletionEmptyToken2[PACKAGE_REF]{testCompletionEmptyToken2, testCompletionEmptyToken2, null, null, null, ["+start+", "+end+"], " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
2771
            requestor.getResults());
2771
            requestor.getResults());
2772
}
2772
}
2773
2773
Lines 2792-2803 Link Here
2792
2792
2793
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2793
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2794
		assertResults(
2794
		assertResults(
2795
			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
2795
			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
2796
			requestor.getResults());
2796
			requestor.getResults());
2797
	} else {
2797
	} else {
2798
		assertResults(
2798
		assertResults(
2799
			"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+
2799
			"CompletionEmptyTypeName1[TYPE_REF]{CompletionEmptyTypeName1, , LCompletionEmptyTypeName1;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}\n"+
2800
			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
2800
			"A[TYPE_REF]{A, , LA;, null, null, " +(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
2801
			requestor.getResults());
2801
			requestor.getResults());
2802
	}
2802
	}
2803
}
2803
}
Lines 2816-2852 Link Here
2816
2816
2817
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2817
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2818
		assertEquals(
2818
		assertEquals(
2819
			"element:a    completion:a    relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2819
			"element:a    completion:a    relevance:"+(R_DEFAULT + R_RESOLVED + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2820
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2820
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2821
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2821
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2822
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2822
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2823
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2823
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2824
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2824
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2825
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2825
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2826
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2826
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2827
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2827
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2828
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2828
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2829
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2829
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2830
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2830
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2831
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2831
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2832
			requestor.getResults());
2832
			requestor.getResults());
2833
	} else {
2833
	} else {
2834
		assertEquals(
2834
		assertEquals(
2835
			"element:A    completion:A    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2835
			"element:A    completion:A    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2836
			"element:CompletionEmptyTypeName2    completion:CompletionEmptyTypeName2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2836
			"element:CompletionEmptyTypeName2    completion:CompletionEmptyTypeName2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2837
			"element:a    completion:a    relevance:"+(R_DEFAULT + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2837
			"element:a    completion:a    relevance:"+(R_DEFAULT + R_RESOLVED + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2838
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2838
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2839
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2839
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2840
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2840
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2841
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2841
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2842
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2842
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2843
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2843
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2844
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2844
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2845
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2845
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2846
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2846
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2847
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2847
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2848
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2848
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2849
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2849
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
2850
			requestor.getResults());
2850
			requestor.getResults());
2851
	}
2851
	}
2852
}
2852
}
Lines 2865-2903 Link Here
2865
2865
2866
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2866
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2867
		assertEquals(
2867
		assertEquals(
2868
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2868
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2869
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2869
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2870
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2870
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2871
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2871
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2872
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2872
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2873
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2873
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2874
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2874
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2875
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2875
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2876
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2876
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2877
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2877
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2878
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2878
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2879
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2879
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2880
			"element:x    completion:x    relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
2880
			"element:x    completion:x    relevance:"+(R_DEFAULT + R_RESOLVED + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
2881
			requestor.getResults());
2881
			requestor.getResults());
2882
	} else {
2882
	} else {
2883
		assertEquals(
2883
		assertEquals(
2884
			"element:CompletionEmptyTypeName2    completion:CompletionEmptyTypeName2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2884
			"element:CompletionEmptyTypeName2    completion:CompletionEmptyTypeName2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
2885
			"element:CompletionEmptyTypeName3    completion:CompletionEmptyTypeName3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2885
			"element:CompletionEmptyTypeName3    completion:CompletionEmptyTypeName3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2886
			"element:CompletionEmptyTypeName3.CompletionEmptyTypeName3_1    completion:CompletionEmptyTypeName3_1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2886
			"element:CompletionEmptyTypeName3.CompletionEmptyTypeName3_1    completion:CompletionEmptyTypeName3_1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2887
			"element:CompletionEmptyTypeName3_2    completion:CompletionEmptyTypeName3_2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2887
			"element:CompletionEmptyTypeName3_2    completion:CompletionEmptyTypeName3_2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2888
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2888
			"element:clone    completion:clone()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2889
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2889
			"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2890
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2890
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +		
2891
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2891
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2892
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2892
			"element:getClass    completion:getClass()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2893
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2893
			"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2894
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2894
			"element:notify    completion:notify()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2895
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2895
			"element:notifyAll    completion:notifyAll()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2896
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2896
			"element:toString    completion:toString()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2897
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2897
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2898
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2898
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2899
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2899
			"element:wait    completion:wait()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2900
			"element:x    completion:x    relevance:"+(R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
2900
			"element:x    completion:x    relevance:"+(R_DEFAULT + R_RESOLVED + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
2901
			requestor.getResults());
2901
			requestor.getResults());
2902
	}
2902
	}
2903
}
2903
}
Lines 2911-2918 Link Here
2911
	cu.codeComplete(cu.getSourceRange().getOffset() + cu.getSourceRange().getLength(), requestor);
2911
	cu.codeComplete(cu.getSourceRange().getOffset() + cu.getSourceRange().getLength(), requestor);
2912
	assertEquals(
2912
	assertEquals(
2913
		"should have two methods of 'foo'", 
2913
		"should have two methods of 'foo'", 
2914
		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2914
		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
2915
		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
2915
		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
2916
		requestor.getResults());	
2916
		requestor.getResults());	
2917
}
2917
}
2918
/*
2918
/*
Lines 2928-2935 Link Here
2928
	cu.codeComplete(cursorLocation, requestor);
2928
	cu.codeComplete(cursorLocation, requestor);
2929
2929
2930
	assertEquals(
2930
	assertEquals(
2931
			"element:CompletionExactNameCaseInsensitive    completion:CompletionExactNameCaseInsensitive    relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
2931
			"element:CompletionExactNameCaseInsensitive    completion:CompletionExactNameCaseInsensitive    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
2932
			"element:CompletionExactNameCaseInsensitivePlus    completion:CompletionExactNameCaseInsensitivePlus    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
2932
			"element:CompletionExactNameCaseInsensitivePlus    completion:CompletionExactNameCaseInsensitivePlus    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
2933
			requestor.getResults());
2933
			requestor.getResults());
2934
}
2934
}
2935
/*
2935
/*
Lines 2981-2992 Link Here
2981
	            requestor.getContext());
2981
	            requestor.getContext());
2982
	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2982
	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
2983
			assertResults(
2983
			assertResults(
2984
		            "AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2984
		            "AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2985
		            requestor.getResults());
2985
		            requestor.getResults());
2986
	    } else {
2986
	    } else {
2987
	    	assertResults(
2987
	    	assertResults(
2988
		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
2988
		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
2989
					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2989
					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2990
		            requestor.getResults());
2990
		            requestor.getResults());
2991
	    }
2991
	    }
2992
	} finally {
2992
	} finally {
Lines 3037-3044 Link Here
3037
		            requestor.getResults());
3037
		            requestor.getResults());
3038
	    } else {
3038
	    } else {
3039
	    	assertResults(
3039
	    	assertResults(
3040
		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3040
		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3041
					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3041
					"AType[TYPE_REF]{AType, test, Ltest.AType;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3042
		            requestor.getResults());
3042
		            requestor.getResults());
3043
	    }
3043
	    }
3044
	} finally {
3044
	} finally {
Lines 3083-3094 Link Here
3083
	    
3083
	    
3084
	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
3084
	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
3085
			assertResults(
3085
			assertResults(
3086
		            "AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3086
		            "AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3087
		            requestor.getResults());
3087
		            requestor.getResults());
3088
	    } else {
3088
	    } else {
3089
	    	assertResults(
3089
	    	assertResults(
3090
		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3090
		            "Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3091
					"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3091
					"AInterface[TYPE_REF]{AInterface, test, Ltest.AInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3092
		            requestor.getResults());
3092
		            requestor.getResults());
3093
	    }
3093
	    }
3094
	} finally {
3094
	} finally {
Lines 3109-3119 Link Here
3109
	cu.codeComplete(cursorLocation, requestor);
3109
	cu.codeComplete(cursorLocation, requestor);
3110
3110
3111
	assertEquals(
3111
	assertEquals(
3112
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3112
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3113
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3113
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3114
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3114
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3115
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3115
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3116
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3116
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3117
		requestor.getResults());
3117
		requestor.getResults());
3118
}
3118
}
3119
3119
Lines 3128-3138 Link Here
3128
	cu.codeComplete(cursorLocation, requestor);
3128
	cu.codeComplete(cursorLocation, requestor);
3129
3129
3130
	assertEquals(
3130
	assertEquals(
3131
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3131
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3132
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3132
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3133
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3133
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3134
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3134
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
3135
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3135
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3136
		requestor.getResults());
3136
		requestor.getResults());
3137
}
3137
}
3138
3138
Lines 3147-3153 Link Here
3147
	cu.codeComplete(cursorLocation, requestor);
3147
	cu.codeComplete(cursorLocation, requestor);
3148
3148
3149
	assertEquals(
3149
	assertEquals(
3150
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3150
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3151
		requestor.getResults());
3151
		requestor.getResults());
3152
}
3152
}
3153
3153
Lines 3162-3168 Link Here
3162
	cu.codeComplete(cursorLocation, requestor);
3162
	cu.codeComplete(cursorLocation, requestor);
3163
3163
3164
	assertEquals(
3164
	assertEquals(
3165
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3165
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3166
		requestor.getResults());
3166
		requestor.getResults());
3167
}
3167
}
3168
3168
Lines 3207-3216 Link Here
3207
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3207
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3208
3208
3209
    assertResults(
3209
    assertResults(
3210
    		"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
3210
    		"ABC[TYPE_REF]{p1.ABC, p1, Lp1.ABC;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
3211
    		"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
3211
    		"ABC[TYPE_REF]{p2.ABC, p2, Lp2.ABC;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
3212
			"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
3212
			"A3[TYPE_REF]{A3, , LA3;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
3213
			"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
3213
			"A[TYPE_REF]{A, , LA;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
3214
            requestor.getResults());
3214
            requestor.getResults());
3215
}
3215
}
3216
3216
Lines 3229-3235 Link Here
3229
3229
3230
	assertEquals(
3230
	assertEquals(
3231
		"should have one classe", 
3231
		"should have one classe", 
3232
		"element:PX    completion:pack1.PX    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_QUALIFIED + R_NON_RESTRICTED),
3232
		"element:PX    completion:pack1.PX    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_QUALIFIED + R_NON_RESTRICTED),
3233
		requestor.getResults());
3233
		requestor.getResults());
3234
}
3234
}
3235
3235
Lines 3248-3254 Link Here
3248
3248
3249
	assertEquals(
3249
	assertEquals(
3250
		"should have one class", 
3250
		"should have one class", 
3251
		"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
3251
		"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
3252
		requestor.getResults());	
3252
		requestor.getResults());	
3253
}
3253
}
3254
3254
Lines 3282-3289 Link Here
3282
            requestor.getContext());
3282
            requestor.getContext());
3283
    
3283
    
3284
   assertResults(
3284
   assertResults(
3285
			"CompletionFindConstructor[ANONYMOUS_CLASS_DECLARATION]{, LCompletionFindConstructor;, (I)V, null, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
3285
			"CompletionFindConstructor[ANONYMOUS_CLASS_DECLARATION]{, LCompletionFindConstructor;, (I)V, null, (i), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
3286
			"CompletionFindConstructor[METHOD_REF<CONSTRUCTOR>]{, LCompletionFindConstructor;, (I)V, CompletionFindConstructor, (i), "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}",
3286
			"CompletionFindConstructor[METHOD_REF<CONSTRUCTOR>]{, LCompletionFindConstructor;, (I)V, CompletionFindConstructor, (i), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}",
3287
			requestor.getResults());
3287
			requestor.getResults());
3288
}
3288
}
3289
3289
Lines 3313-3320 Link Here
3313
            requestor.getContext());
3313
            requestor.getContext());
3314
    
3314
    
3315
    assertEquals(
3315
    assertEquals(
3316
			"Constructor2[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor2;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3316
			"Constructor2[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor2;, ()V, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3317
			"Constructor2[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor2;, ()V, Constructor2, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
3317
			"Constructor2[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor2;, ()V, Constructor2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
3318
			requestor.getResults());
3318
			requestor.getResults());
3319
}
3319
}
3320
3320
Lines 3343-3350 Link Here
3343
            requestor.getContext());
3343
            requestor.getContext());
3344
    
3344
    
3345
    assertEquals(
3345
    assertEquals(
3346
			"Constructor3[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor3;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3346
			"Constructor3[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor3;, ()V, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3347
			"Constructor3[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor3;, ()V, Constructor3, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
3347
			"Constructor3[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor3;, ()V, Constructor3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
3348
			requestor.getResults());
3348
			requestor.getResults());
3349
}
3349
}
3350
3350
Lines 3373-3380 Link Here
3373
            requestor.getContext());
3373
            requestor.getContext());
3374
    
3374
    
3375
	assertEquals(
3375
	assertEquals(
3376
			"Constructor4[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor4;, (I)V, null, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3376
			"Constructor4[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor4;, (I)V, null, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3377
			"Constructor4[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor4;, (I)V, Constructor4, (i), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
3377
			"Constructor4[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor4;, (I)V, Constructor4, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
3378
			requestor.getResults());
3378
			requestor.getResults());
3379
}
3379
}
3380
3380
Lines 3403-3410 Link Here
3403
            requestor.getContext());
3403
            requestor.getContext());
3404
    
3404
    
3405
	assertEquals(
3405
	assertEquals(
3406
			"Constructor5[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor5;, (I)V, null, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3406
			"Constructor5[ANONYMOUS_CLASS_DECLARATION]{, Lzconstructors.Constructor5;, (I)V, null, (arg0), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3407
			"Constructor5[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor5;, (I)V, Constructor5, (arg0), " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
3407
			"Constructor5[METHOD_REF<CONSTRUCTOR>]{, Lzconstructors.Constructor5;, (I)V, Constructor5, (arg0), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
3408
			requestor.getResults());
3408
			requestor.getResults());
3409
}
3409
}
3410
3410
Lines 3422-3428 Link Here
3422
	
3422
	
3423
	assertEquals(
3423
	assertEquals(
3424
		"should have one class", 
3424
		"should have one class", 
3425
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
3425
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
3426
		requestor.getResults());
3426
		requestor.getResults());
3427
}
3427
}
3428
3428
Lines 3440-3446 Link Here
3440
3440
3441
	assertEquals(
3441
	assertEquals(
3442
		"should have one class",
3442
		"should have one class",
3443
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
3443
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED + R_NON_RESTRICTED),
3444
		requestor.getResults());
3444
		requestor.getResults());
3445
}
3445
}
3446
3446
Lines 3458-3465 Link Here
3458
	
3458
	
3459
	assertEquals(
3459
	assertEquals(
3460
		"should have one field: 'var' and one variable: 'var'", 
3460
		"should have one field: 'var' and one variable: 'var'", 
3461
		"element:var    completion:this.var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n"+
3461
		"element:var    completion:this.var    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n"+
3462
		"element:var    completion:var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
3462
		"element:var    completion:var    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
3463
		requestor.getResults());	
3463
		requestor.getResults());	
3464
}
3464
}
3465
3465
Lines 3477-3483 Link Here
3477
	
3477
	
3478
	assertEquals(
3478
	assertEquals(
3479
		"should have 1 field of starting with 'va'",
3479
		"should have 1 field of starting with 'va'",
3480
		"element:var    completion:var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3480
		"element:var    completion:var    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3481
		requestor.getResults());
3481
		requestor.getResults());
3482
}
3482
}
3483
3483
Lines 3491-3497 Link Here
3491
	cu.codeComplete(cursorLocation, requestor);
3491
	cu.codeComplete(cursorLocation, requestor);
3492
3492
3493
	assertEquals(
3493
	assertEquals(
3494
		"element:bar    completion:bar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED),
3494
		"element:bar    completion:bar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED),
3495
		requestor.getResults());
3495
		requestor.getResults());
3496
}
3496
}
3497
3497
Lines 3515-3524 Link Here
3515
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3515
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3516
    
3516
    
3517
	assertResults(
3517
	assertResults(
3518
			"pack[PACKAGE_REF]{pack.*;, pack, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
3518
			"pack[PACKAGE_REF]{pack.*;, pack, null, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
3519
			"pack1[PACKAGE_REF]{pack1.*;, pack1, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
3519
			"pack1[PACKAGE_REF]{pack1.*;, pack1, null, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
3520
			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
3520
			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
3521
			"pack2[PACKAGE_REF]{pack2.*;, pack2, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
3521
			"pack2[PACKAGE_REF]{pack2.*;, pack2, null, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
3522
			requestor.getResults());
3522
			requestor.getResults());
3523
}
3523
}
3524
3524
Lines 3539-3546 Link Here
3539
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3539
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3540
    
3540
    
3541
	assertResults(
3541
	assertResults(
3542
			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
3542
			"pack1.pack3[PACKAGE_REF]{pack1.pack3.*;, pack1.pack3, null, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
3543
			"PX[TYPE_REF]{pack1.PX;, pack1, Lpack1.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
3543
			"PX[TYPE_REF]{pack1.PX;, pack1, Lpack1.PX;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
3544
			requestor.getResults());
3544
			requestor.getResults());
3545
}
3545
}
3546
3546
Lines 3557-3563 Link Here
3557
	cu.codeComplete(cursorLocation, requestor);
3557
	cu.codeComplete(cursorLocation, requestor);
3558
	assertEquals(
3558
	assertEquals(
3559
		"should have one local variable of 'var'", 
3559
		"should have one local variable of 'var'", 
3560
		"element:var    completion:var    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
3560
		"element:var    completion:var    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
3561
		requestor.getResults());	
3561
		requestor.getResults());	
3562
}
3562
}
3563
3563
Lines 3586-3592 Link Here
3586
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3586
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3587
3587
3588
	assertResults(
3588
	assertResults(
3589
		"B1.Inner1[TYPE_REF]{Inner1, , LB1$Inner1;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) +"}",
3589
		"B1.Inner1[TYPE_REF]{Inner1, , LB1$Inner1;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) +"}",
3590
		requestor.getResults());
3590
		requestor.getResults());
3591
}
3591
}
3592
3592
Lines 3614-3620 Link Here
3614
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3614
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3615
3615
3616
	assertResults(
3616
	assertResults(
3617
		"B2.ZInner2[TYPE_REF]{ZInner2, , LB2$ZInner2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
3617
		"B2.ZInner2[TYPE_REF]{ZInner2, , LB2$ZInner2;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
3618
		requestor.getResults());
3618
		requestor.getResults());
3619
}
3619
}
3620
3620
Lines 3631-3638 Link Here
3631
	cu.codeComplete(cursorLocation, requestor);
3631
	cu.codeComplete(cursorLocation, requestor);
3632
	assertEquals(
3632
	assertEquals(
3633
		"should have two methods of 'foobar'", 
3633
		"should have two methods of 'foobar'", 
3634
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
3634
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
3635
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3635
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3636
		requestor.getResults());		
3636
		requestor.getResults());		
3637
}
3637
}
3638
/**
3638
/**
Lines 3650-3657 Link Here
3650
3650
3651
	assertEquals(
3651
	assertEquals(
3652
		"should have two completions", 
3652
		"should have two completions", 
3653
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
3653
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
3654
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3654
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3655
		requestor.getResults());	
3655
		requestor.getResults());	
3656
}
3656
}
3657
/**
3657
/**
Lines 3667-3673 Link Here
3667
	cu.codeComplete(cursorLocation, requestor);
3667
	cu.codeComplete(cursorLocation, requestor);
3668
	assertEquals(
3668
	assertEquals(
3669
		"should have one method of 'foobar'", 
3669
		"should have one method of 'foobar'", 
3670
		"element:foobar    completion:foobar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
3670
		"element:foobar    completion:foobar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
3671
		requestor.getResults());		
3671
		requestor.getResults());		
3672
}
3672
}
3673
3673
Lines 3685-3691 Link Here
3685
	cu.codeComplete(cursorLocation, requestor);
3685
	cu.codeComplete(cursorLocation, requestor);
3686
	assertEquals(
3686
	assertEquals(
3687
		"should have a method of 'foobar'", 
3687
		"should have a method of 'foobar'", 
3688
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
3688
		"element:foobar    completion:foobar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
3689
		requestor.getResults());
3689
		requestor.getResults());
3690
	cu.close();
3690
	cu.close();
3691
}
3691
}
Lines 3700-3707 Link Here
3700
	cu.codeComplete(cursorLocation, requestor);
3700
	cu.codeComplete(cursorLocation, requestor);
3701
3701
3702
	assertEquals(
3702
	assertEquals(
3703
		"element:SecondaryType1    completion:SecondaryType1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
3703
		"element:SecondaryType1    completion:SecondaryType1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
3704
		"element:SecondaryType2    completion:SecondaryType2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3704
		"element:SecondaryType2    completion:SecondaryType2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
3705
		requestor.getResults());
3705
		requestor.getResults());
3706
}
3706
}
3707
3707
Lines 3719-3725 Link Here
3719
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3719
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3720
3720
3721
    assertResults(
3721
    assertResults(
3722
           "SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
3722
           "SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
3723
			requestor.getResults());
3723
			requestor.getResults());
3724
}
3724
}
3725
3725
Lines 3736-3742 Link Here
3736
	cu.codeComplete(cursorLocation, requestor);
3736
	cu.codeComplete(cursorLocation, requestor);
3737
	assertEquals(
3737
	assertEquals(
3738
		"should have one result of 'bar'", 
3738
		"should have one result of 'bar'", 
3739
		"element:bar    completion:bar    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3739
		"element:bar    completion:bar    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
3740
		requestor.getResults());
3740
		requestor.getResults());
3741
}
3741
}
3742
3742
Lines 3763-3770 Link Here
3763
	this.workingCopies[1].codeComplete(cursorLocation, requestor, this.wcOwner);
3763
	this.workingCopies[1].codeComplete(cursorLocation, requestor, this.wcOwner);
3764
3764
3765
	assertResults(
3765
	assertResults(
3766
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType1;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3766
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType1;, ()V, ZZZ, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3767
			"ZZZZ[TYPE_REF]{test.imported.ZZZZ, test.imported, Ltest.imported.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
3767
			"ZZZZ[TYPE_REF]{test.imported.ZZZZ, test.imported, Ltest.imported.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
3768
			requestor.getResults());
3768
			requestor.getResults());
3769
}
3769
}
3770
3770
Lines 3806-3815 Link Here
3806
	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
3806
	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
3807
3807
3808
	assertResults(
3808
	assertResults(
3809
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType2;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3809
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType2;, ()V, ZZZ, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3810
			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3810
			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3811
			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3811
			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3812
			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
3812
			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
3813
			requestor.getResults());
3813
			requestor.getResults());
3814
}
3814
}
3815
3815
Lines 3849-3858 Link Here
3849
	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
3849
	this.workingCopies[3].codeComplete(cursorLocation, requestor, this.wcOwner);
3850
3850
3851
	assertResults(
3851
	assertResults(
3852
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType3;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3852
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType3;, ()V, ZZZ, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3853
			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3853
			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3854
			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3854
			"ZZZZ[TYPE_REF]{test.imported3.ZZZZ, test.imported3, Ltest.imported3.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3855
			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3855
			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3856
			requestor.getResults());
3856
			requestor.getResults());
3857
}
3857
}
3858
3858
Lines 3886-3894 Link Here
3886
	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
3886
	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
3887
3887
3888
	assertResults(
3888
	assertResults(
3889
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType4;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3889
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType4;, ()V, ZZZ, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3890
			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3890
			"ZZZZ[TYPE_REF]{test.imported2.ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3891
			"ZZZZ[TYPE_REF]{ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3891
			"ZZZZ[TYPE_REF]{ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3892
			requestor.getResults());
3892
			requestor.getResults());
3893
}
3893
}
3894
3894
Lines 3922-3930 Link Here
3922
	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
3922
	this.workingCopies[2].codeComplete(cursorLocation, requestor, this.wcOwner);
3923
3923
3924
	assertResults(
3924
	assertResults(
3925
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType5;, ()V, ZZZ, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3925
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, Ltest.CompletionImportedType5;, ()V, ZZZ, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
3926
			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3926
			"ZZZZ[TYPE_REF]{test.imported1.ZZZZ, test.imported1, Ltest.imported1.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
3927
			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3927
			"ZZZZ[TYPE_REF]{ZZZZ, test.imported2, Ltest.imported2.ZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3928
			requestor.getResults());
3928
			requestor.getResults());
3929
}
3929
}
3930
3930
Lines 3952-3958 Link Here
3952
				requestor.getResults());
3952
				requestor.getResults());
3953
	} else {
3953
	} else {
3954
		assertResults(
3954
		assertResults(
3955
				"CompletionInsideExtends1TopLevel[TYPE_REF]{CompletionInsideExtends1TopLevel, test, Ltest.CompletionInsideExtends1TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3955
				"CompletionInsideExtends1TopLevel[TYPE_REF]{CompletionInsideExtends1TopLevel, test, Ltest.CompletionInsideExtends1TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3956
				requestor.getResults());
3956
				requestor.getResults());
3957
	}
3957
	}
3958
	
3958
	
Lines 3980-3987 Link Here
3980
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3980
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
3981
3981
3982
	assertResults(
3982
	assertResults(
3983
			"CompletionInsideExtends10[TYPE_REF]{CompletionInsideExtends10, test, Ltest.CompletionInsideExtends10;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3983
			"CompletionInsideExtends10[TYPE_REF]{CompletionInsideExtends10, test, Ltest.CompletionInsideExtends10;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3984
			"CompletionInsideExtends10TopLevel[TYPE_REF]{CompletionInsideExtends10TopLevel, test, Ltest.CompletionInsideExtends10TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3984
			"CompletionInsideExtends10TopLevel[TYPE_REF]{CompletionInsideExtends10TopLevel, test, Ltest.CompletionInsideExtends10TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3985
			requestor.getResults());
3985
			requestor.getResults());
3986
}
3986
}
3987
3987
Lines 4058-4064 Link Here
4058
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4058
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4059
4059
4060
	assertResults(
4060
	assertResults(
4061
			"CompletionInsideExtends2TopLevel[TYPE_REF]{CompletionInsideExtends2TopLevel, test, Ltest.CompletionInsideExtends2TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4061
			"CompletionInsideExtends2TopLevel[TYPE_REF]{CompletionInsideExtends2TopLevel, test, Ltest.CompletionInsideExtends2TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4062
			requestor.getResults());
4062
			requestor.getResults());
4063
}
4063
}
4064
4064
Lines 4089-4096 Link Here
4089
				requestor.getResults());
4089
				requestor.getResults());
4090
	} else {
4090
	} else {
4091
		assertResults(
4091
		assertResults(
4092
				"CompletionInsideExtends3[TYPE_REF]{CompletionInsideExtends3, test, Ltest.CompletionInsideExtends3;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4092
				"CompletionInsideExtends3[TYPE_REF]{CompletionInsideExtends3, test, Ltest.CompletionInsideExtends3;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4093
				"CompletionInsideExtends3TopLevel[TYPE_REF]{CompletionInsideExtends3TopLevel, test, Ltest.CompletionInsideExtends3TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4093
				"CompletionInsideExtends3TopLevel[TYPE_REF]{CompletionInsideExtends3TopLevel, test, Ltest.CompletionInsideExtends3TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4094
				requestor.getResults());
4094
				requestor.getResults());
4095
	}
4095
	}
4096
}
4096
}
Lines 4117-4124 Link Here
4117
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4117
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4118
4118
4119
	assertResults(
4119
	assertResults(
4120
			"CompletionInsideExtends4[TYPE_REF]{CompletionInsideExtends4, test, Ltest.CompletionInsideExtends4;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4120
			"CompletionInsideExtends4[TYPE_REF]{CompletionInsideExtends4, test, Ltest.CompletionInsideExtends4;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4121
			"CompletionInsideExtends4TopLevel[TYPE_REF]{CompletionInsideExtends4TopLevel, test, Ltest.CompletionInsideExtends4TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4121
			"CompletionInsideExtends4TopLevel[TYPE_REF]{CompletionInsideExtends4TopLevel, test, Ltest.CompletionInsideExtends4TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4122
			requestor.getResults());
4122
			requestor.getResults());
4123
}
4123
}
4124
4124
Lines 4151-4158 Link Here
4151
				requestor.getResults());
4151
				requestor.getResults());
4152
	} else {
4152
	} else {
4153
		assertResults(
4153
		assertResults(
4154
				"CompletionInsideExtends5[TYPE_REF]{CompletionInsideExtends5, test, Ltest.CompletionInsideExtends5;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4154
				"CompletionInsideExtends5[TYPE_REF]{CompletionInsideExtends5, test, Ltest.CompletionInsideExtends5;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4155
				"CompletionInsideExtends5TopLevel[TYPE_REF]{CompletionInsideExtends5TopLevel, test, Ltest.CompletionInsideExtends5TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4155
				"CompletionInsideExtends5TopLevel[TYPE_REF]{CompletionInsideExtends5TopLevel, test, Ltest.CompletionInsideExtends5TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4156
				requestor.getResults());
4156
				requestor.getResults());
4157
	}
4157
	}
4158
}
4158
}
Lines 4181-4188 Link Here
4181
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4181
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4182
4182
4183
	assertResults(
4183
	assertResults(
4184
			"CompletionInsideExtends6[TYPE_REF]{CompletionInsideExtends6, test, Ltest.CompletionInsideExtends6;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4184
			"CompletionInsideExtends6[TYPE_REF]{CompletionInsideExtends6, test, Ltest.CompletionInsideExtends6;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4185
			"CompletionInsideExtends6TopLevel[TYPE_REF]{CompletionInsideExtends6TopLevel, test, Ltest.CompletionInsideExtends6TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4185
			"CompletionInsideExtends6TopLevel[TYPE_REF]{CompletionInsideExtends6TopLevel, test, Ltest.CompletionInsideExtends6TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4186
			requestor.getResults());
4186
			requestor.getResults());
4187
}
4187
}
4188
4188
Lines 4210-4216 Link Here
4210
				requestor.getResults());
4210
				requestor.getResults());
4211
	} else {
4211
	} else {
4212
		assertResults(
4212
		assertResults(
4213
				"CompletionInsideExtends7TopLevel[TYPE_REF]{CompletionInsideExtends7TopLevel, test, Ltest.CompletionInsideExtends7TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4213
				"CompletionInsideExtends7TopLevel[TYPE_REF]{CompletionInsideExtends7TopLevel, test, Ltest.CompletionInsideExtends7TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4214
				requestor.getResults());
4214
				requestor.getResults());
4215
	}
4215
	}
4216
}
4216
}
Lines 4233-4239 Link Here
4233
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4233
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4234
4234
4235
	assertResults(
4235
	assertResults(
4236
			"CompletionInsideExtends8TopLevel[TYPE_REF]{CompletionInsideExtends8TopLevel, test, Ltest.CompletionInsideExtends8TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4236
			"CompletionInsideExtends8TopLevel[TYPE_REF]{CompletionInsideExtends8TopLevel, test, Ltest.CompletionInsideExtends8TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4237
			requestor.getResults());
4237
			requestor.getResults());
4238
}
4238
}
4239
4239
Lines 4264-4271 Link Here
4264
				requestor.getResults());
4264
				requestor.getResults());
4265
	} else {
4265
	} else {
4266
		assertResults(
4266
		assertResults(
4267
				"CompletionInsideExtends9[TYPE_REF]{CompletionInsideExtends9, test, Ltest.CompletionInsideExtends9;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4267
				"CompletionInsideExtends9[TYPE_REF]{CompletionInsideExtends9, test, Ltest.CompletionInsideExtends9;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4268
				"CompletionInsideExtends9TopLevel[TYPE_REF]{CompletionInsideExtends9TopLevel, test, Ltest.CompletionInsideExtends9TopLevel;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4268
				"CompletionInsideExtends9TopLevel[TYPE_REF]{CompletionInsideExtends9TopLevel, test, Ltest.CompletionInsideExtends9TopLevel;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CLASS + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4269
				requestor.getResults());
4269
				requestor.getResults());
4270
	}
4270
	}
4271
}
4271
}
Lines 4287-4294 Link Here
4287
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4287
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
4288
4288
4289
	assertResults(
4289
	assertResults(
4290
			"CompletionInsideGenericClas[POTENTIAL_METHOD_DECLARATION]{CompletionInsideGenericClas, Ltest.CompletionInsideGenericClass;, ()V, CompletionInsideGenericClas, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
4290
			"CompletionInsideGenericClas[POTENTIAL_METHOD_DECLARATION]{CompletionInsideGenericClas, Ltest.CompletionInsideGenericClass;, ()V, CompletionInsideGenericClas, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
4291
			"CompletionInsideGenericClass[TYPE_REF]{CompletionInsideGenericClass, test, Ltest.CompletionInsideGenericClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4291
			"CompletionInsideGenericClass[TYPE_REF]{CompletionInsideGenericClass, test, Ltest.CompletionInsideGenericClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4292
			requestor.getResults());
4292
			requestor.getResults());
4293
}
4293
}
4294
4294
Lines 4302-4308 Link Here
4302
	cu.codeComplete(cursorLocation, requestor);
4302
	cu.codeComplete(cursorLocation, requestor);
4303
4303
4304
	assertEquals(
4304
	assertEquals(
4305
			"element:doTheThing    completion:doTheThing()    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4305
			"element:doTheThing    completion:doTheThing()    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4306
			requestor.getResults());
4306
			requestor.getResults());
4307
}
4307
}
4308
public void testCompletionInstanceofOperator1() throws JavaModelException {
4308
public void testCompletionInstanceofOperator1() throws JavaModelException {
Lines 4315-4324 Link Here
4315
		cu.codeComplete(cursorLocation, requestor);
4315
		cu.codeComplete(cursorLocation, requestor);
4316
4316
4317
		assertEquals(
4317
		assertEquals(
4318
			"element:WWWCompletionInstanceof1    completion:WWWCompletionInstanceof1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
4318
			"element:WWWCompletionInstanceof1    completion:WWWCompletionInstanceof1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
4319
			"element:WWWCompletionInstanceof2    completion:WWWCompletionInstanceof2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
4319
			"element:WWWCompletionInstanceof2    completion:WWWCompletionInstanceof2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
4320
			"element:WWWCompletionInstanceof3    completion:WWWCompletionInstanceof3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
4320
			"element:WWWCompletionInstanceof3    completion:WWWCompletionInstanceof3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
4321
			"element:WWWCompletionInstanceof4    completion:WWWCompletionInstanceof4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4321
			"element:WWWCompletionInstanceof4    completion:WWWCompletionInstanceof4    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4322
			requestor.getResults());
4322
			requestor.getResults());
4323
}
4323
}
4324
4324
Lines 4332-4338 Link Here
4332
		cu.codeComplete(cursorLocation, requestor);
4332
		cu.codeComplete(cursorLocation, requestor);
4333
4333
4334
		assertEquals(
4334
		assertEquals(
4335
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4335
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4336
			requestor.getResults());
4336
			requestor.getResults());
4337
}
4337
}
4338
4338
Lines 4360-4366 Link Here
4360
		cu.codeComplete(cursorLocation, requestor);
4360
		cu.codeComplete(cursorLocation, requestor);
4361
4361
4362
		assertEquals(
4362
		assertEquals(
4363
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4363
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4364
			requestor.getResults());
4364
			requestor.getResults());
4365
}
4365
}
4366
public void testCompletionKeywordAbstract12() throws JavaModelException {
4366
public void testCompletionKeywordAbstract12() throws JavaModelException {
Lines 4373-4379 Link Here
4373
		cu.codeComplete(cursorLocation, requestor);
4373
		cu.codeComplete(cursorLocation, requestor);
4374
4374
4375
		assertEquals(
4375
		assertEquals(
4376
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4376
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4377
			requestor.getResults());
4377
			requestor.getResults());
4378
}
4378
}
4379
4379
Lines 4387-4393 Link Here
4387
		cu.codeComplete(cursorLocation, requestor);
4387
		cu.codeComplete(cursorLocation, requestor);
4388
4388
4389
		assertEquals(
4389
		assertEquals(
4390
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4390
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4391
			requestor.getResults());
4391
			requestor.getResults());
4392
}
4392
}
4393
4393
Lines 4415-4421 Link Here
4415
		cu.codeComplete(cursorLocation, requestor);
4415
		cu.codeComplete(cursorLocation, requestor);
4416
4416
4417
		assertEquals(
4417
		assertEquals(
4418
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4418
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4419
			requestor.getResults());
4419
			requestor.getResults());
4420
}
4420
}
4421
public void testCompletionKeywordAbstract16() throws JavaModelException {
4421
public void testCompletionKeywordAbstract16() throws JavaModelException {
Lines 4428-4434 Link Here
4428
		cu.codeComplete(cursorLocation, requestor);
4428
		cu.codeComplete(cursorLocation, requestor);
4429
4429
4430
		assertEquals(
4430
		assertEquals(
4431
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4431
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4432
			requestor.getResults());
4432
			requestor.getResults());
4433
}
4433
}
4434
public void testCompletionKeywordAbstract2() throws JavaModelException {
4434
public void testCompletionKeywordAbstract2() throws JavaModelException {
Lines 4454-4460 Link Here
4454
		cu.codeComplete(cursorLocation, requestor);
4454
		cu.codeComplete(cursorLocation, requestor);
4455
4455
4456
		assertEquals(
4456
		assertEquals(
4457
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4457
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4458
			requestor.getResults());
4458
			requestor.getResults());
4459
}
4459
}
4460
public void testCompletionKeywordAbstract4() throws JavaModelException {
4460
public void testCompletionKeywordAbstract4() throws JavaModelException {
Lines 4467-4473 Link Here
4467
		cu.codeComplete(cursorLocation, requestor);
4467
		cu.codeComplete(cursorLocation, requestor);
4468
4468
4469
		assertEquals(
4469
		assertEquals(
4470
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4470
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4471
			requestor.getResults());
4471
			requestor.getResults());
4472
}
4472
}
4473
public void testCompletionKeywordAbstract5() throws JavaModelException {
4473
public void testCompletionKeywordAbstract5() throws JavaModelException {
Lines 4480-4486 Link Here
4480
		cu.codeComplete(cursorLocation, requestor);
4480
		cu.codeComplete(cursorLocation, requestor);
4481
4481
4482
		assertEquals(
4482
		assertEquals(
4483
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4483
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4484
			requestor.getResults());
4484
			requestor.getResults());
4485
}
4485
}
4486
public void testCompletionKeywordAbstract6() throws JavaModelException {
4486
public void testCompletionKeywordAbstract6() throws JavaModelException {
Lines 4506-4512 Link Here
4506
		cu.codeComplete(cursorLocation, requestor);
4506
		cu.codeComplete(cursorLocation, requestor);
4507
4507
4508
		assertEquals(
4508
		assertEquals(
4509
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4509
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4510
			requestor.getResults());
4510
			requestor.getResults());
4511
}
4511
}
4512
public void testCompletionKeywordAbstract8() throws JavaModelException {
4512
public void testCompletionKeywordAbstract8() throws JavaModelException {
Lines 4519-4525 Link Here
4519
		cu.codeComplete(cursorLocation, requestor);
4519
		cu.codeComplete(cursorLocation, requestor);
4520
4520
4521
		assertEquals(
4521
		assertEquals(
4522
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4522
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4523
			requestor.getResults());
4523
			requestor.getResults());
4524
}
4524
}
4525
public void testCompletionKeywordAbstract9() throws JavaModelException {
4525
public void testCompletionKeywordAbstract9() throws JavaModelException {
Lines 4532-4538 Link Here
4532
		cu.codeComplete(cursorLocation, requestor);
4532
		cu.codeComplete(cursorLocation, requestor);
4533
4533
4534
		assertEquals(
4534
		assertEquals(
4535
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4535
			"element:abstract    completion:abstract    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4536
			requestor.getResults());
4536
			requestor.getResults());
4537
}
4537
}
4538
public void testCompletionKeywordAssert1() throws JavaModelException {
4538
public void testCompletionKeywordAssert1() throws JavaModelException {
Lines 4545-4551 Link Here
4545
		cu.codeComplete(cursorLocation, requestor);
4545
		cu.codeComplete(cursorLocation, requestor);
4546
4546
4547
		assertEquals(
4547
		assertEquals(
4548
			"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4548
			"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4549
			requestor.getResults());
4549
			requestor.getResults());
4550
}
4550
}
4551
public void testCompletionKeywordAssert2() throws JavaModelException {
4551
public void testCompletionKeywordAssert2() throws JavaModelException {
Lines 4584-4590 Link Here
4584
		cu.codeComplete(cursorLocation, requestor);
4584
		cu.codeComplete(cursorLocation, requestor);
4585
4585
4586
		assertEquals(
4586
		assertEquals(
4587
			"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4587
			"element:assert    completion:assert    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4588
			requestor.getResults());
4588
			requestor.getResults());
4589
}
4589
}
4590
public void testCompletionKeywordAssert5() throws JavaModelException {
4590
public void testCompletionKeywordAssert5() throws JavaModelException {
Lines 4623-4629 Link Here
4623
		cu.codeComplete(cursorLocation, requestor);
4623
		cu.codeComplete(cursorLocation, requestor);
4624
4624
4625
		assertEquals(
4625
		assertEquals(
4626
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4626
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4627
			requestor.getResults());
4627
			requestor.getResults());
4628
}
4628
}
4629
public void testCompletionKeywordBreak2() throws JavaModelException {
4629
public void testCompletionKeywordBreak2() throws JavaModelException {
Lines 4649-4655 Link Here
4649
		cu.codeComplete(cursorLocation, requestor);
4649
		cu.codeComplete(cursorLocation, requestor);
4650
4650
4651
		assertEquals(
4651
		assertEquals(
4652
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4652
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4653
			requestor.getResults());
4653
			requestor.getResults());
4654
}
4654
}
4655
public void testCompletionKeywordBreak4() throws JavaModelException {
4655
public void testCompletionKeywordBreak4() throws JavaModelException {
Lines 4662-4668 Link Here
4662
		cu.codeComplete(cursorLocation, requestor);
4662
		cu.codeComplete(cursorLocation, requestor);
4663
4663
4664
		assertEquals(
4664
		assertEquals(
4665
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4665
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4666
			requestor.getResults());
4666
			requestor.getResults());
4667
}
4667
}
4668
public void testCompletionKeywordBreak5() throws JavaModelException {
4668
public void testCompletionKeywordBreak5() throws JavaModelException {
Lines 4688-4694 Link Here
4688
		cu.codeComplete(cursorLocation, requestor);
4688
		cu.codeComplete(cursorLocation, requestor);
4689
4689
4690
		assertEquals(
4690
		assertEquals(
4691
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4691
			"element:break    completion:break    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4692
			requestor.getResults());
4692
			requestor.getResults());
4693
}
4693
}
4694
public void testCompletionKeywordCase1() throws JavaModelException {
4694
public void testCompletionKeywordCase1() throws JavaModelException {
Lines 4701-4707 Link Here
4701
		cu.codeComplete(cursorLocation, requestor);
4701
		cu.codeComplete(cursorLocation, requestor);
4702
4702
4703
		assertEquals(
4703
		assertEquals(
4704
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4704
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4705
			requestor.getResults());
4705
			requestor.getResults());
4706
}
4706
}
4707
public void testCompletionKeywordCase10() throws JavaModelException {
4707
public void testCompletionKeywordCase10() throws JavaModelException {
Lines 4727-4733 Link Here
4727
		cu.codeComplete(cursorLocation, requestor);
4727
		cu.codeComplete(cursorLocation, requestor);
4728
4728
4729
		assertEquals(
4729
		assertEquals(
4730
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4730
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4731
			requestor.getResults());
4731
			requestor.getResults());
4732
}
4732
}
4733
public void testCompletionKeywordCase3() throws JavaModelException {
4733
public void testCompletionKeywordCase3() throws JavaModelException {
Lines 4740-4746 Link Here
4740
		cu.codeComplete(cursorLocation, requestor);
4740
		cu.codeComplete(cursorLocation, requestor);
4741
4741
4742
		assertEquals(
4742
		assertEquals(
4743
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4743
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4744
			requestor.getResults());
4744
			requestor.getResults());
4745
}
4745
}
4746
public void testCompletionKeywordCase4() throws JavaModelException {
4746
public void testCompletionKeywordCase4() throws JavaModelException {
Lines 4753-4759 Link Here
4753
		cu.codeComplete(cursorLocation, requestor);
4753
		cu.codeComplete(cursorLocation, requestor);
4754
4754
4755
		assertEquals(
4755
		assertEquals(
4756
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4756
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4757
			requestor.getResults());
4757
			requestor.getResults());
4758
}
4758
}
4759
public void testCompletionKeywordCase5() throws JavaModelException {
4759
public void testCompletionKeywordCase5() throws JavaModelException {
Lines 4779-4785 Link Here
4779
		cu.codeComplete(cursorLocation, requestor);
4779
		cu.codeComplete(cursorLocation, requestor);
4780
4780
4781
		assertEquals(
4781
		assertEquals(
4782
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4782
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4783
			requestor.getResults());
4783
			requestor.getResults());
4784
}
4784
}
4785
public void testCompletionKeywordCase7() throws JavaModelException {
4785
public void testCompletionKeywordCase7() throws JavaModelException {
Lines 4792-4798 Link Here
4792
		cu.codeComplete(cursorLocation, requestor);
4792
		cu.codeComplete(cursorLocation, requestor);
4793
4793
4794
		assertEquals(
4794
		assertEquals(
4795
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4795
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4796
			requestor.getResults());
4796
			requestor.getResults());
4797
}
4797
}
4798
public void testCompletionKeywordCase8() throws JavaModelException {
4798
public void testCompletionKeywordCase8() throws JavaModelException {
Lines 4805-4811 Link Here
4805
		cu.codeComplete(cursorLocation, requestor);
4805
		cu.codeComplete(cursorLocation, requestor);
4806
4806
4807
		assertEquals(
4807
		assertEquals(
4808
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4808
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4809
			requestor.getResults());
4809
			requestor.getResults());
4810
}
4810
}
4811
public void testCompletionKeywordCase9() throws JavaModelException {
4811
public void testCompletionKeywordCase9() throws JavaModelException {
Lines 4818-4824 Link Here
4818
		cu.codeComplete(cursorLocation, requestor);
4818
		cu.codeComplete(cursorLocation, requestor);
4819
4819
4820
		assertEquals(
4820
		assertEquals(
4821
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4821
			"element:case    completion:case    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4822
			requestor.getResults());
4822
			requestor.getResults());
4823
}
4823
}
4824
public void testCompletionKeywordCatch1() throws JavaModelException {
4824
public void testCompletionKeywordCatch1() throws JavaModelException {
Lines 4831-4837 Link Here
4831
		cu.codeComplete(cursorLocation, requestor);
4831
		cu.codeComplete(cursorLocation, requestor);
4832
4832
4833
		assertEquals(
4833
		assertEquals(
4834
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4834
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4835
			requestor.getResults());
4835
			requestor.getResults());
4836
}
4836
}
4837
public void testCompletionKeywordCatch10() throws JavaModelException {
4837
public void testCompletionKeywordCatch10() throws JavaModelException {
Lines 4844-4851 Link Here
4844
		cu.codeComplete(cursorLocation, requestor);
4844
		cu.codeComplete(cursorLocation, requestor);
4845
4845
4846
		assertEquals(
4846
		assertEquals(
4847
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
4847
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
4848
			"element:catchz    completion:catchz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4848
			"element:catchz    completion:catchz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4849
			requestor.getResults());
4849
			requestor.getResults());
4850
}
4850
}
4851
public void testCompletionKeywordCatch2() throws JavaModelException {
4851
public void testCompletionKeywordCatch2() throws JavaModelException {
Lines 4897-4904 Link Here
4897
		cu.codeComplete(cursorLocation, requestor);
4897
		cu.codeComplete(cursorLocation, requestor);
4898
4898
4899
		assertEquals(
4899
		assertEquals(
4900
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
4900
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
4901
			"element:catchz    completion:catchz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4901
			"element:catchz    completion:catchz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
4902
			requestor.getResults());
4902
			requestor.getResults());
4903
}
4903
}
4904
public void testCompletionKeywordCatch6() throws JavaModelException {
4904
public void testCompletionKeywordCatch6() throws JavaModelException {
Lines 4911-4917 Link Here
4911
		cu.codeComplete(cursorLocation, requestor);
4911
		cu.codeComplete(cursorLocation, requestor);
4912
4912
4913
		assertEquals(
4913
		assertEquals(
4914
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4914
			"element:catch    completion:catch    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4915
			requestor.getResults());
4915
			requestor.getResults());
4916
}
4916
}
4917
public void testCompletionKeywordCatch7() throws JavaModelException {
4917
public void testCompletionKeywordCatch7() throws JavaModelException {
Lines 4963-4969 Link Here
4963
		cu.codeComplete(cursorLocation, requestor);
4963
		cu.codeComplete(cursorLocation, requestor);
4964
4964
4965
		assertEquals(
4965
		assertEquals(
4966
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4966
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4967
			requestor.getResults());
4967
			requestor.getResults());
4968
}
4968
}
4969
public void testCompletionKeywordClass10() throws JavaModelException {
4969
public void testCompletionKeywordClass10() throws JavaModelException {
Lines 4976-4984 Link Here
4976
		cu.codeComplete(cursorLocation, requestor);
4976
		cu.codeComplete(cursorLocation, requestor);
4977
4977
4978
		assertEquals(
4978
		assertEquals(
4979
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4979
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4980
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4980
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4981
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4981
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4982
			requestor.getResults());
4982
			requestor.getResults());
4983
}
4983
}
4984
public void testCompletionKeywordClass11() throws JavaModelException {
4984
public void testCompletionKeywordClass11() throws JavaModelException {
Lines 4991-4999 Link Here
4991
		cu.codeComplete(cursorLocation, requestor);
4991
		cu.codeComplete(cursorLocation, requestor);
4992
4992
4993
		assertEquals(
4993
		assertEquals(
4994
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4994
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4995
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4995
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
4996
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4996
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
4997
			requestor.getResults());
4997
			requestor.getResults());
4998
}
4998
}
4999
public void testCompletionKeywordClass12() throws JavaModelException {
4999
public void testCompletionKeywordClass12() throws JavaModelException {
Lines 5006-5014 Link Here
5006
		cu.codeComplete(cursorLocation, requestor);
5006
		cu.codeComplete(cursorLocation, requestor);
5007
5007
5008
		assertEquals(
5008
		assertEquals(
5009
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5009
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5010
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5010
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5011
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5011
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5012
			requestor.getResults());
5012
			requestor.getResults());
5013
}
5013
}
5014
public void testCompletionKeywordClass13() throws JavaModelException {
5014
public void testCompletionKeywordClass13() throws JavaModelException {
Lines 5021-5027 Link Here
5021
		cu.codeComplete(cursorLocation, requestor);
5021
		cu.codeComplete(cursorLocation, requestor);
5022
5022
5023
		assertEquals(
5023
		assertEquals(
5024
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5024
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5025
			requestor.getResults());
5025
			requestor.getResults());
5026
}
5026
}
5027
public void testCompletionKeywordClass14() throws JavaModelException {
5027
public void testCompletionKeywordClass14() throws JavaModelException {
Lines 5034-5042 Link Here
5034
		cu.codeComplete(cursorLocation, requestor);
5034
		cu.codeComplete(cursorLocation, requestor);
5035
5035
5036
		assertEquals(
5036
		assertEquals(
5037
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5037
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5038
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5038
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5039
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5039
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5040
			requestor.getResults());
5040
			requestor.getResults());
5041
}
5041
}
5042
public void testCompletionKeywordClass15() throws JavaModelException {
5042
public void testCompletionKeywordClass15() throws JavaModelException {
Lines 5049-5057 Link Here
5049
		cu.codeComplete(cursorLocation, requestor);
5049
		cu.codeComplete(cursorLocation, requestor);
5050
5050
5051
		assertEquals(
5051
		assertEquals(
5052
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5052
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5053
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5053
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5054
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5054
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5055
			requestor.getResults());
5055
			requestor.getResults());
5056
}
5056
}
5057
public void testCompletionKeywordClass16() throws JavaModelException {
5057
public void testCompletionKeywordClass16() throws JavaModelException {
Lines 5064-5072 Link Here
5064
		cu.codeComplete(cursorLocation, requestor);
5064
		cu.codeComplete(cursorLocation, requestor);
5065
5065
5066
		assertEquals(
5066
		assertEquals(
5067
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5067
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5068
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5068
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5069
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5069
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5070
			requestor.getResults());
5070
			requestor.getResults());
5071
}
5071
}
5072
public void testCompletionKeywordClass17() throws JavaModelException {
5072
public void testCompletionKeywordClass17() throws JavaModelException {
Lines 5079-5085 Link Here
5079
		cu.codeComplete(cursorLocation, requestor);
5079
		cu.codeComplete(cursorLocation, requestor);
5080
5080
5081
		assertEquals(
5081
		assertEquals(
5082
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5082
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5083
			requestor.getResults());
5083
			requestor.getResults());
5084
}
5084
}
5085
public void testCompletionKeywordClass18() throws JavaModelException {
5085
public void testCompletionKeywordClass18() throws JavaModelException {
Lines 5092-5098 Link Here
5092
		cu.codeComplete(cursorLocation, requestor);
5092
		cu.codeComplete(cursorLocation, requestor);
5093
5093
5094
		assertEquals(
5094
		assertEquals(
5095
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5095
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5096
			requestor.getResults());
5096
			requestor.getResults());
5097
}
5097
}
5098
public void testCompletionKeywordClass19() throws JavaModelException {
5098
public void testCompletionKeywordClass19() throws JavaModelException {
Lines 5105-5111 Link Here
5105
		cu.codeComplete(cursorLocation, requestor);
5105
		cu.codeComplete(cursorLocation, requestor);
5106
5106
5107
		assertEquals(
5107
		assertEquals(
5108
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5108
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5109
			requestor.getResults());
5109
			requestor.getResults());
5110
}
5110
}
5111
public void testCompletionKeywordClass2() throws JavaModelException {
5111
public void testCompletionKeywordClass2() throws JavaModelException {
Lines 5118-5124 Link Here
5118
		cu.codeComplete(cursorLocation, requestor);
5118
		cu.codeComplete(cursorLocation, requestor);
5119
5119
5120
		assertEquals(
5120
		assertEquals(
5121
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5121
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5122
			requestor.getResults());
5122
			requestor.getResults());
5123
}
5123
}
5124
public void testCompletionKeywordClass20() throws JavaModelException {
5124
public void testCompletionKeywordClass20() throws JavaModelException {
Lines 5131-5137 Link Here
5131
		cu.codeComplete(cursorLocation, requestor);
5131
		cu.codeComplete(cursorLocation, requestor);
5132
5132
5133
		assertEquals(
5133
		assertEquals(
5134
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5134
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5135
			requestor.getResults());
5135
			requestor.getResults());
5136
}
5136
}
5137
public void testCompletionKeywordClass21() throws JavaModelException {
5137
public void testCompletionKeywordClass21() throws JavaModelException {
Lines 5144-5152 Link Here
5144
		cu.codeComplete(cursorLocation, requestor);
5144
		cu.codeComplete(cursorLocation, requestor);
5145
5145
5146
		assertEquals(
5146
		assertEquals(
5147
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5147
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5148
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5148
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5149
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5149
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5150
			requestor.getResults());
5150
			requestor.getResults());
5151
}
5151
}
5152
public void testCompletionKeywordClass22() throws JavaModelException {
5152
public void testCompletionKeywordClass22() throws JavaModelException {
Lines 5159-5167 Link Here
5159
		cu.codeComplete(cursorLocation, requestor);
5159
		cu.codeComplete(cursorLocation, requestor);
5160
5160
5161
		assertEquals(
5161
		assertEquals(
5162
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5162
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5163
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5163
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5164
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5164
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5165
			requestor.getResults());
5165
			requestor.getResults());
5166
}
5166
}
5167
public void testCompletionKeywordClass23() throws JavaModelException {
5167
public void testCompletionKeywordClass23() throws JavaModelException {
Lines 5174-5182 Link Here
5174
		cu.codeComplete(cursorLocation, requestor);
5174
		cu.codeComplete(cursorLocation, requestor);
5175
5175
5176
		assertEquals(
5176
		assertEquals(
5177
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5177
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5178
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5178
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5179
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5179
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5180
			requestor.getResults());
5180
			requestor.getResults());
5181
}
5181
}
5182
public void testCompletionKeywordClass24() throws JavaModelException {
5182
public void testCompletionKeywordClass24() throws JavaModelException {
Lines 5189-5197 Link Here
5189
		cu.codeComplete(cursorLocation, requestor);
5189
		cu.codeComplete(cursorLocation, requestor);
5190
5190
5191
		assertEquals(
5191
		assertEquals(
5192
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5192
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5193
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5193
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5194
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5194
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5195
			requestor.getResults());
5195
			requestor.getResults());
5196
}
5196
}
5197
public void testCompletionKeywordClass3() throws JavaModelException {
5197
public void testCompletionKeywordClass3() throws JavaModelException {
Lines 5204-5210 Link Here
5204
		cu.codeComplete(cursorLocation, requestor);
5204
		cu.codeComplete(cursorLocation, requestor);
5205
5205
5206
		assertEquals(
5206
		assertEquals(
5207
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5207
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5208
			requestor.getResults());
5208
			requestor.getResults());
5209
}
5209
}
5210
public void testCompletionKeywordClass4() throws JavaModelException {
5210
public void testCompletionKeywordClass4() throws JavaModelException {
Lines 5217-5223 Link Here
5217
		cu.codeComplete(cursorLocation, requestor);
5217
		cu.codeComplete(cursorLocation, requestor);
5218
5218
5219
		assertEquals(
5219
		assertEquals(
5220
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5220
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5221
			requestor.getResults());
5221
			requestor.getResults());
5222
}
5222
}
5223
public void testCompletionKeywordClass5() throws JavaModelException {
5223
public void testCompletionKeywordClass5() throws JavaModelException {
Lines 5230-5236 Link Here
5230
		cu.codeComplete(cursorLocation, requestor);
5230
		cu.codeComplete(cursorLocation, requestor);
5231
5231
5232
		assertEquals(
5232
		assertEquals(
5233
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5233
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5234
			requestor.getResults());
5234
			requestor.getResults());
5235
}
5235
}
5236
public void testCompletionKeywordClass6() throws JavaModelException {
5236
public void testCompletionKeywordClass6() throws JavaModelException {
Lines 5243-5251 Link Here
5243
		cu.codeComplete(cursorLocation, requestor);
5243
		cu.codeComplete(cursorLocation, requestor);
5244
5244
5245
		assertEquals(
5245
		assertEquals(
5246
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5246
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5247
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5247
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5248
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5248
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5249
			requestor.getResults());
5249
			requestor.getResults());
5250
}
5250
}
5251
public void testCompletionKeywordClass7() throws JavaModelException {
5251
public void testCompletionKeywordClass7() throws JavaModelException {
Lines 5258-5266 Link Here
5258
		cu.codeComplete(cursorLocation, requestor);
5258
		cu.codeComplete(cursorLocation, requestor);
5259
5259
5260
		assertEquals(
5260
		assertEquals(
5261
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5261
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5262
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5262
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5263
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5263
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5264
			requestor.getResults());
5264
			requestor.getResults());
5265
}
5265
}
5266
public void testCompletionKeywordClass8() throws JavaModelException {
5266
public void testCompletionKeywordClass8() throws JavaModelException {
Lines 5273-5281 Link Here
5273
		cu.codeComplete(cursorLocation, requestor);
5273
		cu.codeComplete(cursorLocation, requestor);
5274
5274
5275
		assertEquals(
5275
		assertEquals(
5276
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5276
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5277
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5277
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5278
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5278
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5279
			requestor.getResults());
5279
			requestor.getResults());
5280
}
5280
}
5281
public void testCompletionKeywordClass9() throws JavaModelException {
5281
public void testCompletionKeywordClass9() throws JavaModelException {
Lines 5288-5296 Link Here
5288
		cu.codeComplete(cursorLocation, requestor);
5288
		cu.codeComplete(cursorLocation, requestor);
5289
5289
5290
		assertEquals(
5290
		assertEquals(
5291
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5291
			"element:Class    completion:Class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5292
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5292
			"element:ClassWithComplexName    completion:ClassWithComplexName    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5293
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5293
			"element:class    completion:class    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5294
			requestor.getResults());
5294
			requestor.getResults());
5295
}
5295
}
5296
public void testCompletionKeywordContinue1() throws JavaModelException {
5296
public void testCompletionKeywordContinue1() throws JavaModelException {
Lines 5303-5309 Link Here
5303
		cu.codeComplete(cursorLocation, requestor);
5303
		cu.codeComplete(cursorLocation, requestor);
5304
5304
5305
		assertEquals(
5305
		assertEquals(
5306
			"element:continue    completion:continue    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5306
			"element:continue    completion:continue    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5307
			requestor.getResults());
5307
			requestor.getResults());
5308
}
5308
}
5309
public void testCompletionKeywordContinue2() throws JavaModelException {
5309
public void testCompletionKeywordContinue2() throws JavaModelException {
Lines 5329-5335 Link Here
5329
		cu.codeComplete(cursorLocation, requestor);
5329
		cu.codeComplete(cursorLocation, requestor);
5330
5330
5331
		assertEquals(
5331
		assertEquals(
5332
			"element:continue    completion:continue    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5332
			"element:continue    completion:continue    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5333
			requestor.getResults());
5333
			requestor.getResults());
5334
}
5334
}
5335
public void testCompletionKeywordContinue4() throws JavaModelException {
5335
public void testCompletionKeywordContinue4() throws JavaModelException {
Lines 5355-5361 Link Here
5355
		cu.codeComplete(cursorLocation, requestor);
5355
		cu.codeComplete(cursorLocation, requestor);
5356
5356
5357
		assertEquals(
5357
		assertEquals(
5358
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5358
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5359
			requestor.getResults());
5359
			requestor.getResults());
5360
}
5360
}
5361
public void testCompletionKeywordDefault10() throws JavaModelException {
5361
public void testCompletionKeywordDefault10() throws JavaModelException {
Lines 5368-5374 Link Here
5368
		cu.codeComplete(cursorLocation, requestor);
5368
		cu.codeComplete(cursorLocation, requestor);
5369
5369
5370
		assertEquals(
5370
		assertEquals(
5371
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5371
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5372
			requestor.getResults());
5372
			requestor.getResults());
5373
}
5373
}
5374
public void testCompletionKeywordDefault2() throws JavaModelException {
5374
public void testCompletionKeywordDefault2() throws JavaModelException {
Lines 5381-5388 Link Here
5381
		cu.codeComplete(cursorLocation, requestor);
5381
		cu.codeComplete(cursorLocation, requestor);
5382
5382
5383
		assertEquals(
5383
		assertEquals(
5384
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5384
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5385
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5385
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5386
			requestor.getResults());
5386
			requestor.getResults());
5387
}
5387
}
5388
public void testCompletionKeywordDefault3() throws JavaModelException {
5388
public void testCompletionKeywordDefault3() throws JavaModelException {
Lines 5395-5402 Link Here
5395
		cu.codeComplete(cursorLocation, requestor);
5395
		cu.codeComplete(cursorLocation, requestor);
5396
5396
5397
		assertEquals(
5397
		assertEquals(
5398
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5398
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5399
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5399
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5400
			requestor.getResults());
5400
			requestor.getResults());
5401
}
5401
}
5402
public void testCompletionKeywordDefault4() throws JavaModelException {
5402
public void testCompletionKeywordDefault4() throws JavaModelException {
Lines 5409-5415 Link Here
5409
		cu.codeComplete(cursorLocation, requestor);
5409
		cu.codeComplete(cursorLocation, requestor);
5410
5410
5411
		assertEquals(
5411
		assertEquals(
5412
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5412
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5413
			requestor.getResults());
5413
			requestor.getResults());
5414
}
5414
}
5415
public void testCompletionKeywordDefault5() throws JavaModelException {
5415
public void testCompletionKeywordDefault5() throws JavaModelException {
Lines 5422-5428 Link Here
5422
		cu.codeComplete(cursorLocation, requestor);
5422
		cu.codeComplete(cursorLocation, requestor);
5423
5423
5424
		assertEquals(
5424
		assertEquals(
5425
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5425
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5426
			requestor.getResults());
5426
			requestor.getResults());
5427
}
5427
}
5428
public void testCompletionKeywordDefault6() throws JavaModelException {
5428
public void testCompletionKeywordDefault6() throws JavaModelException {
Lines 5435-5441 Link Here
5435
		cu.codeComplete(cursorLocation, requestor);
5435
		cu.codeComplete(cursorLocation, requestor);
5436
5436
5437
		assertEquals(
5437
		assertEquals(
5438
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5438
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5439
			requestor.getResults());
5439
			requestor.getResults());
5440
}
5440
}
5441
public void testCompletionKeywordDefault7() throws JavaModelException {
5441
public void testCompletionKeywordDefault7() throws JavaModelException {
Lines 5448-5455 Link Here
5448
		cu.codeComplete(cursorLocation, requestor);
5448
		cu.codeComplete(cursorLocation, requestor);
5449
5449
5450
		assertEquals(
5450
		assertEquals(
5451
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5451
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5452
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5452
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5453
			requestor.getResults());
5453
			requestor.getResults());
5454
}
5454
}
5455
public void testCompletionKeywordDefault8() throws JavaModelException {
5455
public void testCompletionKeywordDefault8() throws JavaModelException {
Lines 5462-5469 Link Here
5462
		cu.codeComplete(cursorLocation, requestor);
5462
		cu.codeComplete(cursorLocation, requestor);
5463
5463
5464
		assertEquals(
5464
		assertEquals(
5465
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5465
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
5466
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5466
			"element:default    completion:default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5467
			requestor.getResults());
5467
			requestor.getResults());
5468
}
5468
}
5469
public void testCompletionKeywordDefault9() throws JavaModelException {
5469
public void testCompletionKeywordDefault9() throws JavaModelException {
Lines 5476-5482 Link Here
5476
		cu.codeComplete(cursorLocation, requestor);
5476
		cu.codeComplete(cursorLocation, requestor);
5477
5477
5478
		assertEquals(
5478
		assertEquals(
5479
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5479
			"element:Default    completion:Default    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
5480
			requestor.getResults());
5480
			requestor.getResults());
5481
}
5481
}
5482
public void testCompletionKeywordDo1() throws JavaModelException {
5482
public void testCompletionKeywordDo1() throws JavaModelException {
Lines 5489-5496 Link Here
5489
		cu.codeComplete(cursorLocation, requestor);
5489
		cu.codeComplete(cursorLocation, requestor);
5490
5490
5491
		assertEquals(
5491
		assertEquals(
5492
			"element:do    completion:do    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
5492
			"element:do    completion:do    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
5493
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5493
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5494
			requestor.getResults());
5494
			requestor.getResults());
5495
}
5495
}
5496
public void testCompletionKeywordDo2() throws JavaModelException {
5496
public void testCompletionKeywordDo2() throws JavaModelException {
Lines 5503-5509 Link Here
5503
		cu.codeComplete(cursorLocation, requestor);
5503
		cu.codeComplete(cursorLocation, requestor);
5504
5504
5505
		assertEquals(
5505
		assertEquals(
5506
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5506
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5507
			requestor.getResults());
5507
			requestor.getResults());
5508
}
5508
}
5509
public void testCompletionKeywordDo3() throws JavaModelException {
5509
public void testCompletionKeywordDo3() throws JavaModelException {
Lines 5516-5522 Link Here
5516
		cu.codeComplete(cursorLocation, requestor);
5516
		cu.codeComplete(cursorLocation, requestor);
5517
5517
5518
		assertEquals(
5518
		assertEquals(
5519
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5519
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5520
			requestor.getResults());
5520
			requestor.getResults());
5521
}
5521
}
5522
public void testCompletionKeywordDo4() throws JavaModelException {
5522
public void testCompletionKeywordDo4() throws JavaModelException {
Lines 5529-5536 Link Here
5529
		cu.codeComplete(cursorLocation, requestor);
5529
		cu.codeComplete(cursorLocation, requestor);
5530
5530
5531
		assertEquals(
5531
		assertEquals(
5532
			"element:do    completion:do    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
5532
			"element:do    completion:do    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"\n"+
5533
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5533
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5534
			requestor.getResults());
5534
			requestor.getResults());
5535
}
5535
}
5536
public void testCompletionKeywordDo5() throws JavaModelException {
5536
public void testCompletionKeywordDo5() throws JavaModelException {
Lines 5543-5549 Link Here
5543
		cu.codeComplete(cursorLocation, requestor);
5543
		cu.codeComplete(cursorLocation, requestor);
5544
5544
5545
		assertEquals(
5545
		assertEquals(
5546
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5546
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5547
			requestor.getResults());
5547
			requestor.getResults());
5548
}
5548
}
5549
public void testCompletionKeywordDo6() throws JavaModelException {
5549
public void testCompletionKeywordDo6() throws JavaModelException {
Lines 5556-5562 Link Here
5556
		cu.codeComplete(cursorLocation, requestor);
5556
		cu.codeComplete(cursorLocation, requestor);
5557
5557
5558
		assertEquals(
5558
		assertEquals(
5559
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5559
			"element:double    completion:double    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5560
			requestor.getResults());
5560
			requestor.getResults());
5561
}
5561
}
5562
public void testCompletionKeywordElse1() throws JavaModelException {
5562
public void testCompletionKeywordElse1() throws JavaModelException {
Lines 5569-5575 Link Here
5569
		cu.codeComplete(cursorLocation, requestor);
5569
		cu.codeComplete(cursorLocation, requestor);
5570
5570
5571
		assertEquals(
5571
		assertEquals(
5572
			"element:else    completion:else    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5572
			"element:else    completion:else    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5573
			requestor.getResults());
5573
			requestor.getResults());
5574
}
5574
}
5575
public void testCompletionKeywordElse2() throws JavaModelException {
5575
public void testCompletionKeywordElse2() throws JavaModelException {
Lines 5621-5627 Link Here
5621
		cu.codeComplete(cursorLocation, requestor);
5621
		cu.codeComplete(cursorLocation, requestor);
5622
5622
5623
		assertEquals(
5623
		assertEquals(
5624
			"element:else    completion:else    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5624
			"element:else    completion:else    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5625
			requestor.getResults());
5625
			requestor.getResults());
5626
}
5626
}
5627
public void testCompletionKeywordElse6() throws JavaModelException {
5627
public void testCompletionKeywordElse6() throws JavaModelException {
Lines 5673-5679 Link Here
5673
		cu.codeComplete(cursorLocation, requestor);
5673
		cu.codeComplete(cursorLocation, requestor);
5674
5674
5675
		assertEquals(
5675
		assertEquals(
5676
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5676
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5677
			requestor.getResults());
5677
			requestor.getResults());
5678
}
5678
}
5679
public void testCompletionKeywordExtends10() throws JavaModelException {
5679
public void testCompletionKeywordExtends10() throws JavaModelException {
Lines 5725-5731 Link Here
5725
		cu.codeComplete(cursorLocation, requestor);
5725
		cu.codeComplete(cursorLocation, requestor);
5726
5726
5727
		assertEquals(
5727
		assertEquals(
5728
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5728
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5729
			requestor.getResults());
5729
			requestor.getResults());
5730
}
5730
}
5731
public void testCompletionKeywordExtends5() throws JavaModelException {
5731
public void testCompletionKeywordExtends5() throws JavaModelException {
Lines 5751-5757 Link Here
5751
		cu.codeComplete(cursorLocation, requestor);
5751
		cu.codeComplete(cursorLocation, requestor);
5752
5752
5753
		assertEquals(
5753
		assertEquals(
5754
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5754
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5755
			requestor.getResults());
5755
			requestor.getResults());
5756
}
5756
}
5757
public void testCompletionKeywordExtends7() throws JavaModelException {
5757
public void testCompletionKeywordExtends7() throws JavaModelException {
Lines 5790-5796 Link Here
5790
		cu.codeComplete(cursorLocation, requestor);
5790
		cu.codeComplete(cursorLocation, requestor);
5791
5791
5792
		assertEquals(
5792
		assertEquals(
5793
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5793
			"element:extends    completion:extends    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5794
			requestor.getResults());
5794
			requestor.getResults());
5795
}
5795
}
5796
public void testCompletionKeywordFalse1() throws JavaModelException {
5796
public void testCompletionKeywordFalse1() throws JavaModelException {
Lines 5816-5822 Link Here
5816
		cu.codeComplete(cursorLocation, requestor);
5816
		cu.codeComplete(cursorLocation, requestor);
5817
5817
5818
		assertEquals(
5818
		assertEquals(
5819
			"element:false    completion:false    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
5819
			"element:false    completion:false    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
5820
			requestor.getResults());
5820
			requestor.getResults());
5821
}
5821
}
5822
public void testCompletionKeywordFalse3() throws JavaModelException {
5822
public void testCompletionKeywordFalse3() throws JavaModelException {
Lines 5842-5848 Link Here
5842
		cu.codeComplete(cursorLocation, requestor);
5842
		cu.codeComplete(cursorLocation, requestor);
5843
5843
5844
		assertEquals(
5844
		assertEquals(
5845
			"element:false    completion:false    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
5845
			"element:false    completion:false    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
5846
			requestor.getResults());
5846
			requestor.getResults());
5847
}
5847
}
5848
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=95008
5848
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=95008
Lines 5862-5882 Link Here
5862
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
5862
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
5863
5863
5864
	assertResults(
5864
	assertResults(
5865
			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5865
			"Test[TYPE_REF]{Test, test, Ltest.Test;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5866
			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5866
			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5867
			"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5867
			"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5868
			"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5868
			"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5869
			"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5869
			"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5870
			"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5870
			"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5871
			"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5871
			"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5872
			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5872
			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5873
			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5873
			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5874
			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5874
			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5875
			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5875
			"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5876
			"test[FIELD_REF]{test, Ltest.Test;, Z, test, null, " + (R_DEFAULT + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
5876
			"test[FIELD_REF]{test, Ltest.Test;, Z, test, null, " + (R_DEFAULT + R_RESOLVED + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
5877
			"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
5877
			"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
5878
			"false[KEYWORD]{false, null, null, false, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}\n" +
5878
			"false[KEYWORD]{false, null, null, false, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}\n" +
5879
			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
5879
			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
5880
			requestor.getResults());
5880
			requestor.getResults());
5881
}
5881
}
5882
public void testCompletionKeywordFinal1() throws JavaModelException {
5882
public void testCompletionKeywordFinal1() throws JavaModelException {
Lines 5889-5895 Link Here
5889
		cu.codeComplete(cursorLocation, requestor);
5889
		cu.codeComplete(cursorLocation, requestor);
5890
5890
5891
		assertEquals(
5891
		assertEquals(
5892
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5892
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5893
			requestor.getResults());
5893
			requestor.getResults());
5894
}
5894
}
5895
public void testCompletionKeywordFinal10() throws JavaModelException {
5895
public void testCompletionKeywordFinal10() throws JavaModelException {
Lines 5902-5908 Link Here
5902
		cu.codeComplete(cursorLocation, requestor);
5902
		cu.codeComplete(cursorLocation, requestor);
5903
5903
5904
		assertEquals(
5904
		assertEquals(
5905
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5905
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5906
			requestor.getResults());
5906
			requestor.getResults());
5907
}
5907
}
5908
public void testCompletionKeywordFinal11() throws JavaModelException {
5908
public void testCompletionKeywordFinal11() throws JavaModelException {
Lines 5928-5934 Link Here
5928
		cu.codeComplete(cursorLocation, requestor);
5928
		cu.codeComplete(cursorLocation, requestor);
5929
5929
5930
		assertEquals(
5930
		assertEquals(
5931
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5931
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5932
			requestor.getResults());
5932
			requestor.getResults());
5933
}
5933
}
5934
public void testCompletionKeywordFinal13() throws JavaModelException {
5934
public void testCompletionKeywordFinal13() throws JavaModelException {
Lines 5941-5947 Link Here
5941
		cu.codeComplete(cursorLocation, requestor);
5941
		cu.codeComplete(cursorLocation, requestor);
5942
5942
5943
		assertEquals(
5943
		assertEquals(
5944
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5944
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5945
			requestor.getResults());
5945
			requestor.getResults());
5946
}
5946
}
5947
public void testCompletionKeywordFinal14() throws JavaModelException {
5947
public void testCompletionKeywordFinal14() throws JavaModelException {
Lines 5954-5961 Link Here
5954
		cu.codeComplete(cursorLocation, requestor);
5954
		cu.codeComplete(cursorLocation, requestor);
5955
5955
5956
		assertEquals(
5956
		assertEquals(
5957
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
5957
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
5958
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
5958
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
5959
			requestor.getResults());
5959
			requestor.getResults());
5960
}
5960
}
5961
public void testCompletionKeywordFinal15() throws JavaModelException {
5961
public void testCompletionKeywordFinal15() throws JavaModelException {
Lines 5981-5988 Link Here
5981
		cu.codeComplete(cursorLocation, requestor);
5981
		cu.codeComplete(cursorLocation, requestor);
5982
5982
5983
		assertEquals(
5983
		assertEquals(
5984
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
5984
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
5985
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
5985
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
5986
			requestor.getResults());
5986
			requestor.getResults());
5987
}
5987
}
5988
public void testCompletionKeywordFinal17() throws JavaModelException {
5988
public void testCompletionKeywordFinal17() throws JavaModelException {
Lines 5995-6001 Link Here
5995
		cu.codeComplete(cursorLocation, requestor);
5995
		cu.codeComplete(cursorLocation, requestor);
5996
5996
5997
		assertEquals(
5997
		assertEquals(
5998
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5998
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
5999
			requestor.getResults());
5999
			requestor.getResults());
6000
}
6000
}
6001
public void testCompletionKeywordFinal18() throws JavaModelException {
6001
public void testCompletionKeywordFinal18() throws JavaModelException {
Lines 6008-6015 Link Here
6008
		cu.codeComplete(cursorLocation, requestor);
6008
		cu.codeComplete(cursorLocation, requestor);
6009
6009
6010
		assertEquals(
6010
		assertEquals(
6011
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6011
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6012
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6012
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6013
			requestor.getResults());
6013
			requestor.getResults());
6014
}
6014
}
6015
public void testCompletionKeywordFinal2() throws JavaModelException {
6015
public void testCompletionKeywordFinal2() throws JavaModelException {
Lines 6035-6041 Link Here
6035
		cu.codeComplete(cursorLocation, requestor);
6035
		cu.codeComplete(cursorLocation, requestor);
6036
6036
6037
		assertEquals(
6037
		assertEquals(
6038
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6038
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6039
			requestor.getResults());
6039
			requestor.getResults());
6040
}
6040
}
6041
public void testCompletionKeywordFinal4() throws JavaModelException {
6041
public void testCompletionKeywordFinal4() throws JavaModelException {
Lines 6048-6054 Link Here
6048
		cu.codeComplete(cursorLocation, requestor);
6048
		cu.codeComplete(cursorLocation, requestor);
6049
6049
6050
		assertEquals(
6050
		assertEquals(
6051
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6051
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6052
			requestor.getResults());
6052
			requestor.getResults());
6053
}
6053
}
6054
public void testCompletionKeywordFinal5() throws JavaModelException {
6054
public void testCompletionKeywordFinal5() throws JavaModelException {
Lines 6061-6068 Link Here
6061
		cu.codeComplete(cursorLocation, requestor);
6061
		cu.codeComplete(cursorLocation, requestor);
6062
6062
6063
		assertEquals(
6063
		assertEquals(
6064
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6064
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6065
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
6065
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
6066
			requestor.getResults());
6066
			requestor.getResults());
6067
}
6067
}
6068
public void testCompletionKeywordFinal6() throws JavaModelException {
6068
public void testCompletionKeywordFinal6() throws JavaModelException {
Lines 6088-6095 Link Here
6088
		cu.codeComplete(cursorLocation, requestor);
6088
		cu.codeComplete(cursorLocation, requestor);
6089
6089
6090
		assertEquals(
6090
		assertEquals(
6091
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6091
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6092
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
6092
			"element:finalize    completion:protected void finalize() throws Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
6093
			requestor.getResults());
6093
			requestor.getResults());
6094
}
6094
}
6095
public void testCompletionKeywordFinal8() throws JavaModelException {
6095
public void testCompletionKeywordFinal8() throws JavaModelException {
Lines 6102-6108 Link Here
6102
		cu.codeComplete(cursorLocation, requestor);
6102
		cu.codeComplete(cursorLocation, requestor);
6103
6103
6104
		assertEquals(
6104
		assertEquals(
6105
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6105
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6106
			requestor.getResults());
6106
			requestor.getResults());
6107
}
6107
}
6108
public void testCompletionKeywordFinal9() throws JavaModelException {
6108
public void testCompletionKeywordFinal9() throws JavaModelException {
Lines 6115-6122 Link Here
6115
		cu.codeComplete(cursorLocation, requestor);
6115
		cu.codeComplete(cursorLocation, requestor);
6116
6116
6117
		assertEquals(
6117
		assertEquals(
6118
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6118
			"element:final    completion:final    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6119
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE +R_UNQUALIFIED+ R_NON_RESTRICTED),
6119
			"element:finalize    completion:finalize()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE +R_UNQUALIFIED+ R_NON_RESTRICTED),
6120
			requestor.getResults());
6120
			requestor.getResults());
6121
}
6121
}
6122
public void testCompletionKeywordFinally1() throws JavaModelException {
6122
public void testCompletionKeywordFinally1() throws JavaModelException {
Lines 6129-6135 Link Here
6129
		cu.codeComplete(cursorLocation, requestor);
6129
		cu.codeComplete(cursorLocation, requestor);
6130
6130
6131
		assertEquals(
6131
		assertEquals(
6132
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6132
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6133
			requestor.getResults());
6133
			requestor.getResults());
6134
}
6134
}
6135
public void testCompletionKeywordFinally10() throws JavaModelException {
6135
public void testCompletionKeywordFinally10() throws JavaModelException {
Lines 6168-6174 Link Here
6168
		cu.codeComplete(cursorLocation, requestor);
6168
		cu.codeComplete(cursorLocation, requestor);
6169
6169
6170
		assertEquals(
6170
		assertEquals(
6171
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6171
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6172
			requestor.getResults());
6172
			requestor.getResults());
6173
}
6173
}
6174
public void testCompletionKeywordFinally13() throws JavaModelException {
6174
public void testCompletionKeywordFinally13() throws JavaModelException {
Lines 6181-6188 Link Here
6181
		cu.codeComplete(cursorLocation, requestor);
6181
		cu.codeComplete(cursorLocation, requestor);
6182
6182
6183
		assertEquals(
6183
		assertEquals(
6184
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6184
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6185
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6185
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6186
			requestor.getResults());
6186
			requestor.getResults());
6187
}
6187
}
6188
public void testCompletionKeywordFinally14() throws JavaModelException {
6188
public void testCompletionKeywordFinally14() throws JavaModelException {
Lines 6195-6201 Link Here
6195
		cu.codeComplete(cursorLocation, requestor);
6195
		cu.codeComplete(cursorLocation, requestor);
6196
6196
6197
		assertEquals(
6197
		assertEquals(
6198
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6198
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6199
			requestor.getResults());
6199
			requestor.getResults());
6200
}
6200
}
6201
public void testCompletionKeywordFinally2() throws JavaModelException {
6201
public void testCompletionKeywordFinally2() throws JavaModelException {
Lines 6247-6253 Link Here
6247
		cu.codeComplete(cursorLocation, requestor);
6247
		cu.codeComplete(cursorLocation, requestor);
6248
6248
6249
		assertEquals(
6249
		assertEquals(
6250
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6250
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6251
			requestor.getResults());
6251
			requestor.getResults());
6252
}
6252
}
6253
public void testCompletionKeywordFinally6() throws JavaModelException {
6253
public void testCompletionKeywordFinally6() throws JavaModelException {
Lines 6260-6267 Link Here
6260
		cu.codeComplete(cursorLocation, requestor);
6260
		cu.codeComplete(cursorLocation, requestor);
6261
6261
6262
		assertEquals(
6262
		assertEquals(
6263
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6263
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
6264
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6264
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6265
			requestor.getResults());
6265
			requestor.getResults());
6266
}
6266
}
6267
public void testCompletionKeywordFinally7() throws JavaModelException {
6267
public void testCompletionKeywordFinally7() throws JavaModelException {
Lines 6274-6280 Link Here
6274
		cu.codeComplete(cursorLocation, requestor);
6274
		cu.codeComplete(cursorLocation, requestor);
6275
6275
6276
		assertEquals(
6276
		assertEquals(
6277
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6277
			"element:finallyz    completion:finallyz    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6278
			requestor.getResults());
6278
			requestor.getResults());
6279
}
6279
}
6280
public void testCompletionKeywordFinally8() throws JavaModelException {
6280
public void testCompletionKeywordFinally8() throws JavaModelException {
Lines 6287-6293 Link Here
6287
		cu.codeComplete(cursorLocation, requestor);
6287
		cu.codeComplete(cursorLocation, requestor);
6288
6288
6289
		assertEquals(
6289
		assertEquals(
6290
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6290
			"element:finally    completion:finally    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6291
			requestor.getResults());
6291
			requestor.getResults());
6292
}
6292
}
6293
public void testCompletionKeywordFinally9() throws JavaModelException {
6293
public void testCompletionKeywordFinally9() throws JavaModelException {
Lines 6313-6320 Link Here
6313
		cu.codeComplete(cursorLocation, requestor);
6313
		cu.codeComplete(cursorLocation, requestor);
6314
6314
6315
		assertEquals(
6315
		assertEquals(
6316
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
6316
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
6317
			"element:for    completion:for    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6317
			"element:for    completion:for    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6318
			requestor.getResults());
6318
			requestor.getResults());
6319
}
6319
}
6320
public void testCompletionKeywordFor2() throws JavaModelException {
6320
public void testCompletionKeywordFor2() throws JavaModelException {
Lines 6327-6333 Link Here
6327
		cu.codeComplete(cursorLocation, requestor);
6327
		cu.codeComplete(cursorLocation, requestor);
6328
6328
6329
		assertEquals(
6329
		assertEquals(
6330
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6330
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6331
			requestor.getResults());
6331
			requestor.getResults());
6332
}
6332
}
6333
public void testCompletionKeywordFor3() throws JavaModelException {
6333
public void testCompletionKeywordFor3() throws JavaModelException {
Lines 6353-6360 Link Here
6353
		cu.codeComplete(cursorLocation, requestor);
6353
		cu.codeComplete(cursorLocation, requestor);
6354
6354
6355
		assertEquals(
6355
		assertEquals(
6356
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
6356
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
6357
			"element:for    completion:for    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6357
			"element:for    completion:for    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6358
			requestor.getResults());
6358
			requestor.getResults());
6359
}
6359
}
6360
public void testCompletionKeywordFor5() throws JavaModelException {
6360
public void testCompletionKeywordFor5() throws JavaModelException {
Lines 6367-6373 Link Here
6367
		cu.codeComplete(cursorLocation, requestor);
6367
		cu.codeComplete(cursorLocation, requestor);
6368
6368
6369
		assertEquals(
6369
		assertEquals(
6370
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6370
			"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
6371
			requestor.getResults());
6371
			requestor.getResults());
6372
}
6372
}
6373
public void testCompletionKeywordFor6() throws JavaModelException {
6373
public void testCompletionKeywordFor6() throws JavaModelException {
Lines 6393-6399 Link Here
6393
		cu.codeComplete(cursorLocation, requestor);
6393
		cu.codeComplete(cursorLocation, requestor);
6394
6394
6395
		assertEquals(
6395
		assertEquals(
6396
			"element:if    completion:if    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
6396
			"element:if    completion:if    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
6397
			requestor.getResults());
6397
			requestor.getResults());
6398
}
6398
}
6399
public void testCompletionKeywordIf2() throws JavaModelException {
6399
public void testCompletionKeywordIf2() throws JavaModelException {
Lines 6432-6438 Link Here
6432
		cu.codeComplete(cursorLocation, requestor);
6432
		cu.codeComplete(cursorLocation, requestor);
6433
6433
6434
		assertEquals(
6434
		assertEquals(
6435
			"element:if    completion:if    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
6435
			"element:if    completion:if    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
6436
			requestor.getResults());
6436
			requestor.getResults());
6437
}
6437
}
6438
public void testCompletionKeywordIf5() throws JavaModelException {
6438
public void testCompletionKeywordIf5() throws JavaModelException {
Lines 6471-6477 Link Here
6471
		cu.codeComplete(cursorLocation, requestor);
6471
		cu.codeComplete(cursorLocation, requestor);
6472
6472
6473
		assertEquals(
6473
		assertEquals(
6474
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6474
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6475
			requestor.getResults());
6475
			requestor.getResults());
6476
}
6476
}
6477
public void testCompletionKeywordImplements2() throws JavaModelException {
6477
public void testCompletionKeywordImplements2() throws JavaModelException {
Lines 6484-6490 Link Here
6484
		cu.codeComplete(cursorLocation, requestor);
6484
		cu.codeComplete(cursorLocation, requestor);
6485
6485
6486
		assertEquals(
6486
		assertEquals(
6487
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6487
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6488
			requestor.getResults());
6488
			requestor.getResults());
6489
}
6489
}
6490
public void testCompletionKeywordImplements3() throws JavaModelException {
6490
public void testCompletionKeywordImplements3() throws JavaModelException {
Lines 6510-6516 Link Here
6510
		cu.codeComplete(cursorLocation, requestor);
6510
		cu.codeComplete(cursorLocation, requestor);
6511
6511
6512
		assertEquals(
6512
		assertEquals(
6513
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6513
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6514
			requestor.getResults());
6514
			requestor.getResults());
6515
}
6515
}
6516
public void testCompletionKeywordImplements5() throws JavaModelException {
6516
public void testCompletionKeywordImplements5() throws JavaModelException {
Lines 6523-6529 Link Here
6523
		cu.codeComplete(cursorLocation, requestor);
6523
		cu.codeComplete(cursorLocation, requestor);
6524
6524
6525
		assertEquals(
6525
		assertEquals(
6526
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6526
			"element:implements    completion:implements    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6527
			requestor.getResults());
6527
			requestor.getResults());
6528
}
6528
}
6529
public void testCompletionKeywordImplements6() throws JavaModelException {
6529
public void testCompletionKeywordImplements6() throws JavaModelException {
Lines 6549-6555 Link Here
6549
		cu.codeComplete(cursorLocation, requestor);
6549
		cu.codeComplete(cursorLocation, requestor);
6550
6550
6551
		assertEquals(
6551
		assertEquals(
6552
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6552
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6553
			requestor.getResults());
6553
			requestor.getResults());
6554
}
6554
}
6555
public void testCompletionKeywordImport2() throws JavaModelException {
6555
public void testCompletionKeywordImport2() throws JavaModelException {
Lines 6562-6568 Link Here
6562
		cu.codeComplete(cursorLocation, requestor);
6562
		cu.codeComplete(cursorLocation, requestor);
6563
6563
6564
		assertEquals(
6564
		assertEquals(
6565
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6565
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6566
			requestor.getResults());
6566
			requestor.getResults());
6567
}
6567
}
6568
public void testCompletionKeywordImport3() throws JavaModelException {
6568
public void testCompletionKeywordImport3() throws JavaModelException {
Lines 6575-6581 Link Here
6575
		cu.codeComplete(cursorLocation, requestor);
6575
		cu.codeComplete(cursorLocation, requestor);
6576
6576
6577
		assertEquals(
6577
		assertEquals(
6578
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6578
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6579
			requestor.getResults());
6579
			requestor.getResults());
6580
}
6580
}
6581
public void testCompletionKeywordImport4() throws JavaModelException {
6581
public void testCompletionKeywordImport4() throws JavaModelException {
Lines 6601-6607 Link Here
6601
		cu.codeComplete(cursorLocation, requestor);
6601
		cu.codeComplete(cursorLocation, requestor);
6602
6602
6603
		assertEquals(
6603
		assertEquals(
6604
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6604
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6605
			requestor.getResults());
6605
			requestor.getResults());
6606
}
6606
}
6607
public void testCompletionKeywordImport6() throws JavaModelException {
6607
public void testCompletionKeywordImport6() throws JavaModelException {
Lines 6627-6633 Link Here
6627
		cu.codeComplete(cursorLocation, requestor);
6627
		cu.codeComplete(cursorLocation, requestor);
6628
6628
6629
		assertEquals(
6629
		assertEquals(
6630
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6630
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6631
			requestor.getResults());
6631
			requestor.getResults());
6632
}
6632
}
6633
public void testCompletionKeywordImport8() throws JavaModelException {
6633
public void testCompletionKeywordImport8() throws JavaModelException {
Lines 6640-6646 Link Here
6640
		cu.codeComplete(cursorLocation, requestor);
6640
		cu.codeComplete(cursorLocation, requestor);
6641
6641
6642
		assertEquals(
6642
		assertEquals(
6643
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6643
			"element:import    completion:import    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6644
			requestor.getResults());
6644
			requestor.getResults());
6645
}
6645
}
6646
public void testCompletionKeywordInstanceof1() throws JavaModelException {
6646
public void testCompletionKeywordInstanceof1() throws JavaModelException {
Lines 6653-6659 Link Here
6653
		cu.codeComplete(cursorLocation, requestor);
6653
		cu.codeComplete(cursorLocation, requestor);
6654
6654
6655
		assertEquals(
6655
		assertEquals(
6656
			"element:instanceof    completion:instanceof    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6656
			"element:instanceof    completion:instanceof    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6657
			requestor.getResults());
6657
			requestor.getResults());
6658
}
6658
}
6659
public void testCompletionKeywordInstanceof2() throws JavaModelException {
6659
public void testCompletionKeywordInstanceof2() throws JavaModelException {
Lines 6692-6698 Link Here
6692
		cu.codeComplete(cursorLocation, requestor);
6692
		cu.codeComplete(cursorLocation, requestor);
6693
6693
6694
		assertEquals(
6694
		assertEquals(
6695
			"element:instanceof    completion:instanceof    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6695
			"element:instanceof    completion:instanceof    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6696
			requestor.getResults());
6696
			requestor.getResults());
6697
}
6697
}
6698
public void testCompletionKeywordInstanceof5() throws JavaModelException {
6698
public void testCompletionKeywordInstanceof5() throws JavaModelException {
Lines 6731-6737 Link Here
6731
		cu.codeComplete(cursorLocation, requestor);
6731
		cu.codeComplete(cursorLocation, requestor);
6732
6732
6733
		assertEquals(
6733
		assertEquals(
6734
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6734
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6735
			requestor.getResults());
6735
			requestor.getResults());
6736
}
6736
}
6737
public void testCompletionKeywordInterface10() throws JavaModelException {
6737
public void testCompletionKeywordInterface10() throws JavaModelException {
Lines 6744-6750 Link Here
6744
		cu.codeComplete(cursorLocation, requestor);
6744
		cu.codeComplete(cursorLocation, requestor);
6745
6745
6746
		assertEquals(
6746
		assertEquals(
6747
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6747
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6748
			requestor.getResults());
6748
			requestor.getResults());
6749
}
6749
}
6750
public void testCompletionKeywordInterface11() throws JavaModelException {
6750
public void testCompletionKeywordInterface11() throws JavaModelException {
Lines 6757-6763 Link Here
6757
		cu.codeComplete(cursorLocation, requestor);
6757
		cu.codeComplete(cursorLocation, requestor);
6758
6758
6759
		assertEquals(
6759
		assertEquals(
6760
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6760
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6761
			requestor.getResults());
6761
			requestor.getResults());
6762
}
6762
}
6763
public void testCompletionKeywordInterface12() throws JavaModelException {
6763
public void testCompletionKeywordInterface12() throws JavaModelException {
Lines 6770-6776 Link Here
6770
		cu.codeComplete(cursorLocation, requestor);
6770
		cu.codeComplete(cursorLocation, requestor);
6771
6771
6772
		assertEquals(
6772
		assertEquals(
6773
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6773
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6774
			requestor.getResults());
6774
			requestor.getResults());
6775
}
6775
}
6776
public void testCompletionKeywordInterface13() throws JavaModelException {
6776
public void testCompletionKeywordInterface13() throws JavaModelException {
Lines 6783-6789 Link Here
6783
		cu.codeComplete(cursorLocation, requestor);
6783
		cu.codeComplete(cursorLocation, requestor);
6784
6784
6785
		assertEquals(
6785
		assertEquals(
6786
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6786
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6787
			requestor.getResults());
6787
			requestor.getResults());
6788
}
6788
}
6789
public void testCompletionKeywordInterface14() throws JavaModelException {
6789
public void testCompletionKeywordInterface14() throws JavaModelException {
Lines 6796-6802 Link Here
6796
		cu.codeComplete(cursorLocation, requestor);
6796
		cu.codeComplete(cursorLocation, requestor);
6797
6797
6798
		assertEquals(
6798
		assertEquals(
6799
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6799
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6800
			requestor.getResults());
6800
			requestor.getResults());
6801
}
6801
}
6802
public void testCompletionKeywordInterface15() throws JavaModelException {
6802
public void testCompletionKeywordInterface15() throws JavaModelException {
Lines 6809-6815 Link Here
6809
		cu.codeComplete(cursorLocation, requestor);
6809
		cu.codeComplete(cursorLocation, requestor);
6810
6810
6811
		assertEquals(
6811
		assertEquals(
6812
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6812
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6813
			requestor.getResults());
6813
			requestor.getResults());
6814
}
6814
}
6815
public void testCompletionKeywordInterface16() throws JavaModelException {
6815
public void testCompletionKeywordInterface16() throws JavaModelException {
Lines 6822-6828 Link Here
6822
		cu.codeComplete(cursorLocation, requestor);
6822
		cu.codeComplete(cursorLocation, requestor);
6823
6823
6824
		assertEquals(
6824
		assertEquals(
6825
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6825
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6826
			requestor.getResults());
6826
			requestor.getResults());
6827
}
6827
}
6828
public void testCompletionKeywordInterface17() throws JavaModelException {
6828
public void testCompletionKeywordInterface17() throws JavaModelException {
Lines 6835-6841 Link Here
6835
		cu.codeComplete(cursorLocation, requestor);
6835
		cu.codeComplete(cursorLocation, requestor);
6836
6836
6837
		assertEquals(
6837
		assertEquals(
6838
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6838
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6839
			requestor.getResults());
6839
			requestor.getResults());
6840
}
6840
}
6841
public void testCompletionKeywordInterface18() throws JavaModelException {
6841
public void testCompletionKeywordInterface18() throws JavaModelException {
Lines 6848-6854 Link Here
6848
		cu.codeComplete(cursorLocation, requestor);
6848
		cu.codeComplete(cursorLocation, requestor);
6849
6849
6850
		assertEquals(
6850
		assertEquals(
6851
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6851
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6852
			requestor.getResults());
6852
			requestor.getResults());
6853
}
6853
}
6854
public void testCompletionKeywordInterface2() throws JavaModelException {
6854
public void testCompletionKeywordInterface2() throws JavaModelException {
Lines 6861-6867 Link Here
6861
		cu.codeComplete(cursorLocation, requestor);
6861
		cu.codeComplete(cursorLocation, requestor);
6862
6862
6863
		assertEquals(
6863
		assertEquals(
6864
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6864
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6865
			requestor.getResults());
6865
			requestor.getResults());
6866
}
6866
}
6867
public void testCompletionKeywordInterface3() throws JavaModelException {
6867
public void testCompletionKeywordInterface3() throws JavaModelException {
Lines 6874-6880 Link Here
6874
		cu.codeComplete(cursorLocation, requestor);
6874
		cu.codeComplete(cursorLocation, requestor);
6875
6875
6876
		assertEquals(
6876
		assertEquals(
6877
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6877
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6878
			requestor.getResults());
6878
			requestor.getResults());
6879
}
6879
}
6880
public void testCompletionKeywordInterface4() throws JavaModelException {
6880
public void testCompletionKeywordInterface4() throws JavaModelException {
Lines 6887-6893 Link Here
6887
		cu.codeComplete(cursorLocation, requestor);
6887
		cu.codeComplete(cursorLocation, requestor);
6888
6888
6889
		assertEquals(
6889
		assertEquals(
6890
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6890
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6891
			requestor.getResults());
6891
			requestor.getResults());
6892
}
6892
}
6893
public void testCompletionKeywordInterface5() throws JavaModelException {
6893
public void testCompletionKeywordInterface5() throws JavaModelException {
Lines 6900-6906 Link Here
6900
		cu.codeComplete(cursorLocation, requestor);
6900
		cu.codeComplete(cursorLocation, requestor);
6901
6901
6902
		assertEquals(
6902
		assertEquals(
6903
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6903
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6904
			requestor.getResults());
6904
			requestor.getResults());
6905
}
6905
}
6906
public void testCompletionKeywordInterface6() throws JavaModelException {
6906
public void testCompletionKeywordInterface6() throws JavaModelException {
Lines 6913-6919 Link Here
6913
		cu.codeComplete(cursorLocation, requestor);
6913
		cu.codeComplete(cursorLocation, requestor);
6914
6914
6915
		assertEquals(
6915
		assertEquals(
6916
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6916
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6917
			requestor.getResults());
6917
			requestor.getResults());
6918
}
6918
}
6919
public void testCompletionKeywordInterface7() throws JavaModelException {
6919
public void testCompletionKeywordInterface7() throws JavaModelException {
Lines 6926-6932 Link Here
6926
		cu.codeComplete(cursorLocation, requestor);
6926
		cu.codeComplete(cursorLocation, requestor);
6927
6927
6928
		assertEquals(
6928
		assertEquals(
6929
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6929
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6930
			requestor.getResults());
6930
			requestor.getResults());
6931
}
6931
}
6932
public void testCompletionKeywordInterface8() throws JavaModelException {
6932
public void testCompletionKeywordInterface8() throws JavaModelException {
Lines 6939-6945 Link Here
6939
		cu.codeComplete(cursorLocation, requestor);
6939
		cu.codeComplete(cursorLocation, requestor);
6940
6940
6941
		assertEquals(
6941
		assertEquals(
6942
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6942
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6943
			requestor.getResults());
6943
			requestor.getResults());
6944
}
6944
}
6945
public void testCompletionKeywordInterface9() throws JavaModelException {
6945
public void testCompletionKeywordInterface9() throws JavaModelException {
Lines 6952-6958 Link Here
6952
		cu.codeComplete(cursorLocation, requestor);
6952
		cu.codeComplete(cursorLocation, requestor);
6953
6953
6954
		assertEquals(
6954
		assertEquals(
6955
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6955
			"element:interface    completion:interface    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6956
			requestor.getResults());
6956
			requestor.getResults());
6957
}
6957
}
6958
public void testCompletionKeywordNative1() throws JavaModelException {
6958
public void testCompletionKeywordNative1() throws JavaModelException {
Lines 6965-6971 Link Here
6965
		cu.codeComplete(cursorLocation, requestor);
6965
		cu.codeComplete(cursorLocation, requestor);
6966
6966
6967
		assertEquals(
6967
		assertEquals(
6968
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6968
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6969
			requestor.getResults());
6969
			requestor.getResults());
6970
}
6970
}
6971
public void testCompletionKeywordNative2() throws JavaModelException {
6971
public void testCompletionKeywordNative2() throws JavaModelException {
Lines 6991-6997 Link Here
6991
		cu.codeComplete(cursorLocation, requestor);
6991
		cu.codeComplete(cursorLocation, requestor);
6992
6992
6993
		assertEquals(
6993
		assertEquals(
6994
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6994
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
6995
			requestor.getResults());
6995
			requestor.getResults());
6996
}
6996
}
6997
public void testCompletionKeywordNative4() throws JavaModelException {
6997
public void testCompletionKeywordNative4() throws JavaModelException {
Lines 7017-7023 Link Here
7017
		cu.codeComplete(cursorLocation, requestor);
7017
		cu.codeComplete(cursorLocation, requestor);
7018
7018
7019
		assertEquals(
7019
		assertEquals(
7020
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7020
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7021
			requestor.getResults());
7021
			requestor.getResults());
7022
}
7022
}
7023
public void testCompletionKeywordNative6() throws JavaModelException {
7023
public void testCompletionKeywordNative6() throws JavaModelException {
Lines 7043-7049 Link Here
7043
		cu.codeComplete(cursorLocation, requestor);
7043
		cu.codeComplete(cursorLocation, requestor);
7044
7044
7045
		assertEquals(
7045
		assertEquals(
7046
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7046
			"element:native    completion:native    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7047
			requestor.getResults());
7047
			requestor.getResults());
7048
}
7048
}
7049
public void testCompletionKeywordNative8() throws JavaModelException {
7049
public void testCompletionKeywordNative8() throws JavaModelException {
Lines 7069-7075 Link Here
7069
		cu.codeComplete(cursorLocation, requestor);
7069
		cu.codeComplete(cursorLocation, requestor);
7070
7070
7071
		assertEquals(
7071
		assertEquals(
7072
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7072
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7073
			requestor.getResults());
7073
			requestor.getResults());
7074
}
7074
}
7075
public void testCompletionKeywordNew10() throws JavaModelException {
7075
public void testCompletionKeywordNew10() throws JavaModelException {
Lines 7082-7088 Link Here
7082
		cu.codeComplete(cursorLocation, requestor);
7082
		cu.codeComplete(cursorLocation, requestor);
7083
7083
7084
		assertEquals(
7084
		assertEquals(
7085
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7085
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7086
			requestor.getResults());
7086
			requestor.getResults());
7087
}
7087
}
7088
public void testCompletionKeywordNew11() throws JavaModelException {
7088
public void testCompletionKeywordNew11() throws JavaModelException {
Lines 7095-7101 Link Here
7095
		cu.codeComplete(cursorLocation, requestor);
7095
		cu.codeComplete(cursorLocation, requestor);
7096
7096
7097
		assertEquals(
7097
		assertEquals(
7098
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7098
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7099
			requestor.getResults());
7099
			requestor.getResults());
7100
}
7100
}
7101
public void testCompletionKeywordNew12() throws JavaModelException {
7101
public void testCompletionKeywordNew12() throws JavaModelException {
Lines 7108-7114 Link Here
7108
		cu.codeComplete(cursorLocation, requestor);
7108
		cu.codeComplete(cursorLocation, requestor);
7109
7109
7110
		assertEquals(
7110
		assertEquals(
7111
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7111
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7112
			requestor.getResults());
7112
			requestor.getResults());
7113
}
7113
}
7114
public void testCompletionKeywordNew13() throws JavaModelException {
7114
public void testCompletionKeywordNew13() throws JavaModelException {
Lines 7121-7127 Link Here
7121
		cu.codeComplete(cursorLocation, requestor);
7121
		cu.codeComplete(cursorLocation, requestor);
7122
7122
7123
		assertEquals(
7123
		assertEquals(
7124
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7124
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7125
			requestor.getResults());
7125
			requestor.getResults());
7126
}
7126
}
7127
public void testCompletionKeywordNew14() throws JavaModelException {
7127
public void testCompletionKeywordNew14() throws JavaModelException {
Lines 7134-7140 Link Here
7134
		cu.codeComplete(cursorLocation, requestor);
7134
		cu.codeComplete(cursorLocation, requestor);
7135
7135
7136
		assertEquals(
7136
		assertEquals(
7137
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7137
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7138
			requestor.getResults());
7138
			requestor.getResults());
7139
}
7139
}
7140
public void testCompletionKeywordNew15() throws JavaModelException {
7140
public void testCompletionKeywordNew15() throws JavaModelException {
Lines 7147-7153 Link Here
7147
		cu.codeComplete(cursorLocation, requestor);
7147
		cu.codeComplete(cursorLocation, requestor);
7148
7148
7149
		assertEquals(
7149
		assertEquals(
7150
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7150
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7151
			requestor.getResults());
7151
			requestor.getResults());
7152
}
7152
}
7153
public void testCompletionKeywordNew16() throws JavaModelException {
7153
public void testCompletionKeywordNew16() throws JavaModelException {
Lines 7160-7166 Link Here
7160
		cu.codeComplete(cursorLocation, requestor);
7160
		cu.codeComplete(cursorLocation, requestor);
7161
7161
7162
		assertEquals(
7162
		assertEquals(
7163
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7163
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7164
			requestor.getResults());
7164
			requestor.getResults());
7165
}
7165
}
7166
public void testCompletionKeywordNew2() throws JavaModelException {
7166
public void testCompletionKeywordNew2() throws JavaModelException {
Lines 7173-7179 Link Here
7173
		cu.codeComplete(cursorLocation, requestor);
7173
		cu.codeComplete(cursorLocation, requestor);
7174
7174
7175
		assertEquals(
7175
		assertEquals(
7176
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7176
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7177
			requestor.getResults());
7177
			requestor.getResults());
7178
}
7178
}
7179
public void testCompletionKeywordNew3() throws JavaModelException {
7179
public void testCompletionKeywordNew3() throws JavaModelException {
Lines 7186-7192 Link Here
7186
		cu.codeComplete(cursorLocation, requestor);
7186
		cu.codeComplete(cursorLocation, requestor);
7187
7187
7188
		assertEquals(
7188
		assertEquals(
7189
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7189
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7190
			requestor.getResults());
7190
			requestor.getResults());
7191
}
7191
}
7192
public void testCompletionKeywordNew4() throws JavaModelException {
7192
public void testCompletionKeywordNew4() throws JavaModelException {
Lines 7199-7205 Link Here
7199
		cu.codeComplete(cursorLocation, requestor);
7199
		cu.codeComplete(cursorLocation, requestor);
7200
7200
7201
		assertEquals(
7201
		assertEquals(
7202
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7202
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7203
			requestor.getResults());
7203
			requestor.getResults());
7204
}
7204
}
7205
public void testCompletionKeywordNew5() throws JavaModelException {
7205
public void testCompletionKeywordNew5() throws JavaModelException {
Lines 7212-7218 Link Here
7212
		cu.codeComplete(cursorLocation, requestor);
7212
		cu.codeComplete(cursorLocation, requestor);
7213
7213
7214
		assertEquals(
7214
		assertEquals(
7215
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7215
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7216
			requestor.getResults());
7216
			requestor.getResults());
7217
}
7217
}
7218
public void testCompletionKeywordNew6() throws JavaModelException {
7218
public void testCompletionKeywordNew6() throws JavaModelException {
Lines 7225-7231 Link Here
7225
		cu.codeComplete(cursorLocation, requestor);
7225
		cu.codeComplete(cursorLocation, requestor);
7226
7226
7227
		assertEquals(
7227
		assertEquals(
7228
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7228
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7229
			requestor.getResults());
7229
			requestor.getResults());
7230
}
7230
}
7231
public void testCompletionKeywordNew7() throws JavaModelException {
7231
public void testCompletionKeywordNew7() throws JavaModelException {
Lines 7238-7244 Link Here
7238
		cu.codeComplete(cursorLocation, requestor);
7238
		cu.codeComplete(cursorLocation, requestor);
7239
7239
7240
		assertEquals(
7240
		assertEquals(
7241
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7241
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7242
			requestor.getResults());
7242
			requestor.getResults());
7243
}
7243
}
7244
public void testCompletionKeywordNew8() throws JavaModelException {
7244
public void testCompletionKeywordNew8() throws JavaModelException {
Lines 7251-7257 Link Here
7251
		cu.codeComplete(cursorLocation, requestor);
7251
		cu.codeComplete(cursorLocation, requestor);
7252
7252
7253
		assertEquals(
7253
		assertEquals(
7254
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7254
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7255
			requestor.getResults());
7255
			requestor.getResults());
7256
}
7256
}
7257
public void testCompletionKeywordNew9() throws JavaModelException {
7257
public void testCompletionKeywordNew9() throws JavaModelException {
Lines 7264-7270 Link Here
7264
		cu.codeComplete(cursorLocation, requestor);
7264
		cu.codeComplete(cursorLocation, requestor);
7265
7265
7266
		assertEquals(
7266
		assertEquals(
7267
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7267
			"element:new    completion:new    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7268
			requestor.getResults());
7268
			requestor.getResults());
7269
}
7269
}
7270
public void testCompletionKeywordNull1() throws JavaModelException {
7270
public void testCompletionKeywordNull1() throws JavaModelException {
Lines 7290-7296 Link Here
7290
		cu.codeComplete(cursorLocation, requestor);
7290
		cu.codeComplete(cursorLocation, requestor);
7291
7291
7292
		assertEquals(
7292
		assertEquals(
7293
			"element:null    completion:null    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7293
			"element:null    completion:null    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7294
			requestor.getResults());
7294
			requestor.getResults());
7295
}
7295
}
7296
public void testCompletionKeywordNull3() throws JavaModelException {
7296
public void testCompletionKeywordNull3() throws JavaModelException {
Lines 7316-7322 Link Here
7316
		cu.codeComplete(cursorLocation, requestor);
7316
		cu.codeComplete(cursorLocation, requestor);
7317
7317
7318
		assertEquals(
7318
		assertEquals(
7319
			"element:null    completion:null    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7319
			"element:null    completion:null    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7320
			requestor.getResults());
7320
			requestor.getResults());
7321
}
7321
}
7322
public void testCompletionKeywordPackage1() throws JavaModelException {
7322
public void testCompletionKeywordPackage1() throws JavaModelException {
Lines 7329-7335 Link Here
7329
		cu.codeComplete(cursorLocation, requestor);
7329
		cu.codeComplete(cursorLocation, requestor);
7330
7330
7331
		assertEquals(
7331
		assertEquals(
7332
			"element:package    completion:package    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7332
			"element:package    completion:package    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7333
			requestor.getResults());
7333
			requestor.getResults());
7334
}
7334
}
7335
public void testCompletionKeywordPackage2() throws JavaModelException {
7335
public void testCompletionKeywordPackage2() throws JavaModelException {
Lines 7434-7440 Link Here
7434
		cu.codeComplete(cursorLocation, requestor);
7434
		cu.codeComplete(cursorLocation, requestor);
7435
7435
7436
		assertEquals(
7436
		assertEquals(
7437
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7437
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7438
			requestor.getResults());
7438
			requestor.getResults());
7439
}
7439
}
7440
public void testCompletionKeywordPrivate10() throws JavaModelException {
7440
public void testCompletionKeywordPrivate10() throws JavaModelException {
Lines 7460-7466 Link Here
7460
		cu.codeComplete(cursorLocation, requestor);
7460
		cu.codeComplete(cursorLocation, requestor);
7461
7461
7462
		assertEquals(
7462
		assertEquals(
7463
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7463
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7464
			requestor.getResults());
7464
			requestor.getResults());
7465
}
7465
}
7466
public void testCompletionKeywordPrivate3() throws JavaModelException {
7466
public void testCompletionKeywordPrivate3() throws JavaModelException {
Lines 7473-7479 Link Here
7473
		cu.codeComplete(cursorLocation, requestor);
7473
		cu.codeComplete(cursorLocation, requestor);
7474
7474
7475
		assertEquals(
7475
		assertEquals(
7476
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7476
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7477
			requestor.getResults());
7477
			requestor.getResults());
7478
}
7478
}
7479
public void testCompletionKeywordPrivate4() throws JavaModelException {
7479
public void testCompletionKeywordPrivate4() throws JavaModelException {
Lines 7512-7518 Link Here
7512
		cu.codeComplete(cursorLocation, requestor);
7512
		cu.codeComplete(cursorLocation, requestor);
7513
7513
7514
		assertEquals(
7514
		assertEquals(
7515
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7515
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7516
			requestor.getResults());
7516
			requestor.getResults());
7517
}
7517
}
7518
public void testCompletionKeywordPrivate7() throws JavaModelException {
7518
public void testCompletionKeywordPrivate7() throws JavaModelException {
Lines 7525-7531 Link Here
7525
		cu.codeComplete(cursorLocation, requestor);
7525
		cu.codeComplete(cursorLocation, requestor);
7526
7526
7527
		assertEquals(
7527
		assertEquals(
7528
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7528
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7529
			requestor.getResults());
7529
			requestor.getResults());
7530
}
7530
}
7531
public void testCompletionKeywordPrivate8() throws JavaModelException {
7531
public void testCompletionKeywordPrivate8() throws JavaModelException {
Lines 7538-7544 Link Here
7538
		cu.codeComplete(cursorLocation, requestor);
7538
		cu.codeComplete(cursorLocation, requestor);
7539
7539
7540
		assertEquals(
7540
		assertEquals(
7541
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7541
			"element:private    completion:private    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7542
			requestor.getResults());
7542
			requestor.getResults());
7543
}
7543
}
7544
public void testCompletionKeywordPrivate9() throws JavaModelException {
7544
public void testCompletionKeywordPrivate9() throws JavaModelException {
Lines 7564-7570 Link Here
7564
		cu.codeComplete(cursorLocation, requestor);
7564
		cu.codeComplete(cursorLocation, requestor);
7565
7565
7566
		assertEquals(
7566
		assertEquals(
7567
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7567
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7568
			requestor.getResults());
7568
			requestor.getResults());
7569
}
7569
}
7570
public void testCompletionKeywordProtected10() throws JavaModelException {
7570
public void testCompletionKeywordProtected10() throws JavaModelException {
Lines 7590-7596 Link Here
7590
		cu.codeComplete(cursorLocation, requestor);
7590
		cu.codeComplete(cursorLocation, requestor);
7591
7591
7592
		assertEquals(
7592
		assertEquals(
7593
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7593
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7594
			requestor.getResults());
7594
			requestor.getResults());
7595
}
7595
}
7596
public void testCompletionKeywordProtected3() throws JavaModelException {
7596
public void testCompletionKeywordProtected3() throws JavaModelException {
Lines 7603-7609 Link Here
7603
		cu.codeComplete(cursorLocation, requestor);
7603
		cu.codeComplete(cursorLocation, requestor);
7604
7604
7605
		assertEquals(
7605
		assertEquals(
7606
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7606
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7607
			requestor.getResults());
7607
			requestor.getResults());
7608
}
7608
}
7609
public void testCompletionKeywordProtected4() throws JavaModelException {
7609
public void testCompletionKeywordProtected4() throws JavaModelException {
Lines 7642-7648 Link Here
7642
		cu.codeComplete(cursorLocation, requestor);
7642
		cu.codeComplete(cursorLocation, requestor);
7643
7643
7644
		assertEquals(
7644
		assertEquals(
7645
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7645
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7646
			requestor.getResults());
7646
			requestor.getResults());
7647
}
7647
}
7648
public void testCompletionKeywordProtected7() throws JavaModelException {
7648
public void testCompletionKeywordProtected7() throws JavaModelException {
Lines 7655-7661 Link Here
7655
		cu.codeComplete(cursorLocation, requestor);
7655
		cu.codeComplete(cursorLocation, requestor);
7656
7656
7657
		assertEquals(
7657
		assertEquals(
7658
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7658
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7659
			requestor.getResults());
7659
			requestor.getResults());
7660
}
7660
}
7661
public void testCompletionKeywordProtected8() throws JavaModelException {
7661
public void testCompletionKeywordProtected8() throws JavaModelException {
Lines 7668-7674 Link Here
7668
		cu.codeComplete(cursorLocation, requestor);
7668
		cu.codeComplete(cursorLocation, requestor);
7669
7669
7670
		assertEquals(
7670
		assertEquals(
7671
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7671
			"element:protected    completion:protected    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7672
			requestor.getResults());
7672
			requestor.getResults());
7673
}
7673
}
7674
public void testCompletionKeywordProtected9() throws JavaModelException {
7674
public void testCompletionKeywordProtected9() throws JavaModelException {
Lines 7694-7700 Link Here
7694
		cu.codeComplete(cursorLocation, requestor);
7694
		cu.codeComplete(cursorLocation, requestor);
7695
7695
7696
		assertEquals(
7696
		assertEquals(
7697
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7697
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7698
			requestor.getResults());
7698
			requestor.getResults());
7699
}
7699
}
7700
public void testCompletionKeywordPublic10() throws JavaModelException {
7700
public void testCompletionKeywordPublic10() throws JavaModelException {
Lines 7720-7726 Link Here
7720
		cu.codeComplete(cursorLocation, requestor);
7720
		cu.codeComplete(cursorLocation, requestor);
7721
7721
7722
		assertEquals(
7722
		assertEquals(
7723
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7723
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7724
			requestor.getResults());
7724
			requestor.getResults());
7725
}
7725
}
7726
public void testCompletionKeywordPublic12() throws JavaModelException {
7726
public void testCompletionKeywordPublic12() throws JavaModelException {
Lines 7746-7752 Link Here
7746
		cu.codeComplete(cursorLocation, requestor);
7746
		cu.codeComplete(cursorLocation, requestor);
7747
7747
7748
		assertEquals(
7748
		assertEquals(
7749
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7749
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7750
			requestor.getResults());
7750
			requestor.getResults());
7751
}
7751
}
7752
public void testCompletionKeywordPublic14() throws JavaModelException {
7752
public void testCompletionKeywordPublic14() throws JavaModelException {
Lines 7759-7765 Link Here
7759
		cu.codeComplete(cursorLocation, requestor);
7759
		cu.codeComplete(cursorLocation, requestor);
7760
7760
7761
		assertEquals(
7761
		assertEquals(
7762
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7762
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7763
			requestor.getResults());
7763
			requestor.getResults());
7764
}
7764
}
7765
public void testCompletionKeywordPublic15() throws JavaModelException {
7765
public void testCompletionKeywordPublic15() throws JavaModelException {
Lines 7798-7804 Link Here
7798
		cu.codeComplete(cursorLocation, requestor);
7798
		cu.codeComplete(cursorLocation, requestor);
7799
7799
7800
		assertEquals(
7800
		assertEquals(
7801
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7801
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7802
			requestor.getResults());
7802
			requestor.getResults());
7803
}
7803
}
7804
public void testCompletionKeywordPublic18() throws JavaModelException {
7804
public void testCompletionKeywordPublic18() throws JavaModelException {
Lines 7811-7817 Link Here
7811
		cu.codeComplete(cursorLocation, requestor);
7811
		cu.codeComplete(cursorLocation, requestor);
7812
7812
7813
		assertEquals(
7813
		assertEquals(
7814
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7814
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7815
			requestor.getResults());
7815
			requestor.getResults());
7816
}
7816
}
7817
public void testCompletionKeywordPublic19() throws JavaModelException {
7817
public void testCompletionKeywordPublic19() throws JavaModelException {
Lines 7824-7830 Link Here
7824
		cu.codeComplete(cursorLocation, requestor);
7824
		cu.codeComplete(cursorLocation, requestor);
7825
7825
7826
		assertEquals(
7826
		assertEquals(
7827
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7827
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7828
			requestor.getResults());
7828
			requestor.getResults());
7829
}
7829
}
7830
public void testCompletionKeywordPublic2() throws JavaModelException {
7830
public void testCompletionKeywordPublic2() throws JavaModelException {
Lines 7837-7843 Link Here
7837
		cu.codeComplete(cursorLocation, requestor);
7837
		cu.codeComplete(cursorLocation, requestor);
7838
7838
7839
		assertEquals(
7839
		assertEquals(
7840
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7840
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7841
			requestor.getResults());
7841
			requestor.getResults());
7842
}
7842
}
7843
public void testCompletionKeywordPublic20() throws JavaModelException {
7843
public void testCompletionKeywordPublic20() throws JavaModelException {
Lines 7863-7869 Link Here
7863
		cu.codeComplete(cursorLocation, requestor);
7863
		cu.codeComplete(cursorLocation, requestor);
7864
7864
7865
		assertEquals(
7865
		assertEquals(
7866
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7866
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7867
			requestor.getResults());
7867
			requestor.getResults());
7868
}
7868
}
7869
public void testCompletionKeywordPublic4() throws JavaModelException {
7869
public void testCompletionKeywordPublic4() throws JavaModelException {
Lines 7902-7908 Link Here
7902
		cu.codeComplete(cursorLocation, requestor);
7902
		cu.codeComplete(cursorLocation, requestor);
7903
7903
7904
		assertEquals(
7904
		assertEquals(
7905
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7905
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7906
			requestor.getResults());
7906
			requestor.getResults());
7907
}
7907
}
7908
public void testCompletionKeywordPublic7() throws JavaModelException {
7908
public void testCompletionKeywordPublic7() throws JavaModelException {
Lines 7915-7921 Link Here
7915
		cu.codeComplete(cursorLocation, requestor);
7915
		cu.codeComplete(cursorLocation, requestor);
7916
7916
7917
		assertEquals(
7917
		assertEquals(
7918
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7918
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7919
			requestor.getResults());
7919
			requestor.getResults());
7920
}
7920
}
7921
public void testCompletionKeywordPublic8() throws JavaModelException {
7921
public void testCompletionKeywordPublic8() throws JavaModelException {
Lines 7928-7934 Link Here
7928
		cu.codeComplete(cursorLocation, requestor);
7928
		cu.codeComplete(cursorLocation, requestor);
7929
7929
7930
		assertEquals(
7930
		assertEquals(
7931
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7931
			"element:public    completion:public    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7932
			requestor.getResults());
7932
			requestor.getResults());
7933
}
7933
}
7934
public void testCompletionKeywordPublic9() throws JavaModelException {
7934
public void testCompletionKeywordPublic9() throws JavaModelException {
Lines 7954-7960 Link Here
7954
		cu.codeComplete(cursorLocation, requestor);
7954
		cu.codeComplete(cursorLocation, requestor);
7955
7955
7956
		assertEquals(
7956
		assertEquals(
7957
			"element:return    completion:return    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7957
			"element:return    completion:return    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7958
			requestor.getResults());
7958
			requestor.getResults());
7959
}
7959
}
7960
public void testCompletionKeywordReturn2() throws JavaModelException {
7960
public void testCompletionKeywordReturn2() throws JavaModelException {
Lines 7993-7999 Link Here
7993
		cu.codeComplete(cursorLocation, requestor);
7993
		cu.codeComplete(cursorLocation, requestor);
7994
7994
7995
		assertEquals(
7995
		assertEquals(
7996
			"element:return    completion:return    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7996
			"element:return    completion:return    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
7997
			requestor.getResults());
7997
			requestor.getResults());
7998
}
7998
}
7999
public void testCompletionKeywordReturn5() throws JavaModelException {
7999
public void testCompletionKeywordReturn5() throws JavaModelException {
Lines 8032-8038 Link Here
8032
		cu.codeComplete(cursorLocation, requestor);
8032
		cu.codeComplete(cursorLocation, requestor);
8033
8033
8034
		assertEquals(
8034
		assertEquals(
8035
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8035
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8036
			requestor.getResults());
8036
			requestor.getResults());
8037
}
8037
}
8038
public void testCompletionKeywordStatic10() throws JavaModelException {
8038
public void testCompletionKeywordStatic10() throws JavaModelException {
Lines 8045-8051 Link Here
8045
		cu.codeComplete(cursorLocation, requestor);
8045
		cu.codeComplete(cursorLocation, requestor);
8046
8046
8047
		assertEquals(
8047
		assertEquals(
8048
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8048
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8049
			requestor.getResults());
8049
			requestor.getResults());
8050
}
8050
}
8051
public void testCompletionKeywordStatic2() throws JavaModelException {
8051
public void testCompletionKeywordStatic2() throws JavaModelException {
Lines 8058-8064 Link Here
8058
		cu.codeComplete(cursorLocation, requestor);
8058
		cu.codeComplete(cursorLocation, requestor);
8059
8059
8060
		assertEquals(
8060
		assertEquals(
8061
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8061
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8062
			requestor.getResults());
8062
			requestor.getResults());
8063
}
8063
}
8064
public void testCompletionKeywordStatic3() throws JavaModelException {
8064
public void testCompletionKeywordStatic3() throws JavaModelException {
Lines 8071-8077 Link Here
8071
		cu.codeComplete(cursorLocation, requestor);
8071
		cu.codeComplete(cursorLocation, requestor);
8072
8072
8073
		assertEquals(
8073
		assertEquals(
8074
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8074
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8075
			requestor.getResults());
8075
			requestor.getResults());
8076
}
8076
}
8077
public void testCompletionKeywordStatic4() throws JavaModelException {
8077
public void testCompletionKeywordStatic4() throws JavaModelException {
Lines 8097-8103 Link Here
8097
		cu.codeComplete(cursorLocation, requestor);
8097
		cu.codeComplete(cursorLocation, requestor);
8098
8098
8099
		assertEquals(
8099
		assertEquals(
8100
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8100
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8101
			requestor.getResults());
8101
			requestor.getResults());
8102
}
8102
}
8103
public void testCompletionKeywordStatic6() throws JavaModelException {
8103
public void testCompletionKeywordStatic6() throws JavaModelException {
Lines 8110-8116 Link Here
8110
		cu.codeComplete(cursorLocation, requestor);
8110
		cu.codeComplete(cursorLocation, requestor);
8111
8111
8112
		assertEquals(
8112
		assertEquals(
8113
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8113
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8114
			requestor.getResults());
8114
			requestor.getResults());
8115
}
8115
}
8116
public void testCompletionKeywordStatic7() throws JavaModelException {
8116
public void testCompletionKeywordStatic7() throws JavaModelException {
Lines 8123-8129 Link Here
8123
		cu.codeComplete(cursorLocation, requestor);
8123
		cu.codeComplete(cursorLocation, requestor);
8124
8124
8125
		assertEquals(
8125
		assertEquals(
8126
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8126
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8127
			requestor.getResults());
8127
			requestor.getResults());
8128
}
8128
}
8129
public void testCompletionKeywordStatic8() throws JavaModelException {
8129
public void testCompletionKeywordStatic8() throws JavaModelException {
Lines 8136-8142 Link Here
8136
		cu.codeComplete(cursorLocation, requestor);
8136
		cu.codeComplete(cursorLocation, requestor);
8137
8137
8138
		assertEquals(
8138
		assertEquals(
8139
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8139
			"element:static    completion:static    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8140
			requestor.getResults());
8140
			requestor.getResults());
8141
}
8141
}
8142
public void testCompletionKeywordStatic9() throws JavaModelException {
8142
public void testCompletionKeywordStatic9() throws JavaModelException {
Lines 8162-8168 Link Here
8162
		cu.codeComplete(cursorLocation, requestor);
8162
		cu.codeComplete(cursorLocation, requestor);
8163
8163
8164
		assertEquals(
8164
		assertEquals(
8165
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8165
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8166
			requestor.getResults());
8166
			requestor.getResults());
8167
}
8167
}
8168
public void testCompletionKeywordStrictfp2() throws JavaModelException {
8168
public void testCompletionKeywordStrictfp2() throws JavaModelException {
Lines 8188-8194 Link Here
8188
		cu.codeComplete(cursorLocation, requestor);
8188
		cu.codeComplete(cursorLocation, requestor);
8189
8189
8190
		assertEquals(
8190
		assertEquals(
8191
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8191
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8192
			requestor.getResults());
8192
			requestor.getResults());
8193
}
8193
}
8194
public void testCompletionKeywordStrictfp4() throws JavaModelException {
8194
public void testCompletionKeywordStrictfp4() throws JavaModelException {
Lines 8214-8220 Link Here
8214
		cu.codeComplete(cursorLocation, requestor);
8214
		cu.codeComplete(cursorLocation, requestor);
8215
8215
8216
		assertEquals(
8216
		assertEquals(
8217
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8217
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8218
			requestor.getResults());
8218
			requestor.getResults());
8219
}
8219
}
8220
public void testCompletionKeywordStrictfp6() throws JavaModelException {
8220
public void testCompletionKeywordStrictfp6() throws JavaModelException {
Lines 8240-8246 Link Here
8240
		cu.codeComplete(cursorLocation, requestor);
8240
		cu.codeComplete(cursorLocation, requestor);
8241
8241
8242
		assertEquals(
8242
		assertEquals(
8243
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8243
			"element:strictfp    completion:strictfp    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8244
			requestor.getResults());
8244
			requestor.getResults());
8245
}
8245
}
8246
public void testCompletionKeywordStrictfp8() throws JavaModelException {
8246
public void testCompletionKeywordStrictfp8() throws JavaModelException {
Lines 8266-8274 Link Here
8266
		cu.codeComplete(cursorLocation, requestor);
8266
		cu.codeComplete(cursorLocation, requestor);
8267
8267
8268
		assertEquals(
8268
		assertEquals(
8269
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8269
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8270
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8270
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8271
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8271
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8272
			requestor.getResults());
8272
			requestor.getResults());
8273
}
8273
}
8274
public void testCompletionKeywordSuper10() throws JavaModelException {
8274
public void testCompletionKeywordSuper10() throws JavaModelException {
Lines 8281-8289 Link Here
8281
		cu.codeComplete(cursorLocation, requestor);
8281
		cu.codeComplete(cursorLocation, requestor);
8282
8282
8283
		assertEquals(
8283
		assertEquals(
8284
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8284
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8285
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8285
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8286
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8286
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8287
			requestor.getResults());
8287
			requestor.getResults());
8288
}
8288
}
8289
public void testCompletionKeywordSuper11() throws JavaModelException {
8289
public void testCompletionKeywordSuper11() throws JavaModelException {
Lines 8296-8303 Link Here
8296
		cu.codeComplete(cursorLocation, requestor);
8296
		cu.codeComplete(cursorLocation, requestor);
8297
8297
8298
		assertEquals(
8298
		assertEquals(
8299
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8299
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8300
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8300
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8301
			requestor.getResults());
8301
			requestor.getResults());
8302
}
8302
}
8303
public void testCompletionKeywordSuper12() throws JavaModelException {
8303
public void testCompletionKeywordSuper12() throws JavaModelException {
Lines 8324-8333 Link Here
8324
            requestor.getContext());
8324
            requestor.getContext());
8325
    
8325
    
8326
    assertResults(
8326
    assertResults(
8327
            "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8327
            "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8328
			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8328
			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8329
			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
8329
			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
8330
			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8330
			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8331
			requestor.getResults());
8331
			requestor.getResults());
8332
}
8332
}
8333
public void testCompletionKeywordSuper2() throws JavaModelException {
8333
public void testCompletionKeywordSuper2() throws JavaModelException {
Lines 8340-8348 Link Here
8340
		cu.codeComplete(cursorLocation, requestor);
8340
		cu.codeComplete(cursorLocation, requestor);
8341
8341
8342
		assertEquals(
8342
		assertEquals(
8343
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8343
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8344
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8344
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8345
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8345
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8346
			requestor.getResults());
8346
			requestor.getResults());
8347
}
8347
}
8348
public void testCompletionKeywordSuper3() throws JavaModelException {
8348
public void testCompletionKeywordSuper3() throws JavaModelException {
Lines 8355-8362 Link Here
8355
		cu.codeComplete(cursorLocation, requestor);
8355
		cu.codeComplete(cursorLocation, requestor);
8356
8356
8357
		assertEquals(
8357
		assertEquals(
8358
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8358
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8359
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8359
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8360
			requestor.getResults());
8360
			requestor.getResults());
8361
}
8361
}
8362
public void testCompletionKeywordSuper4() throws JavaModelException {
8362
public void testCompletionKeywordSuper4() throws JavaModelException {
Lines 8369-8377 Link Here
8369
		cu.codeComplete(cursorLocation, requestor);
8369
		cu.codeComplete(cursorLocation, requestor);
8370
8370
8371
		assertEquals(
8371
		assertEquals(
8372
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8372
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8373
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8373
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8374
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8374
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8375
			requestor.getResults());
8375
			requestor.getResults());
8376
}
8376
}
8377
public void testCompletionKeywordSuper5() throws JavaModelException {
8377
public void testCompletionKeywordSuper5() throws JavaModelException {
Lines 8384-8391 Link Here
8384
		cu.codeComplete(cursorLocation, requestor);
8384
		cu.codeComplete(cursorLocation, requestor);
8385
8385
8386
		assertEquals(
8386
		assertEquals(
8387
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8387
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8388
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8388
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8389
			requestor.getResults());
8389
			requestor.getResults());
8390
}
8390
}
8391
public void testCompletionKeywordSuper6() throws JavaModelException {
8391
public void testCompletionKeywordSuper6() throws JavaModelException {
Lines 8411-8420 Link Here
8411
            requestor.getContext());
8411
            requestor.getContext());
8412
    
8412
    
8413
    assertResults(
8413
    assertResults(
8414
            "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8414
            "SuperClass[TYPE_REF]{SuperClass, , LSuperClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8415
			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8415
			"SuperInterface[TYPE_REF]{SuperInterface, , LSuperInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8416
			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
8416
			"super[KEYWORD]{super, null, null, super, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+"}\n" +
8417
			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8417
			"super[METHOD_REF<CONSTRUCTOR>]{super(), Ljava.lang.Object;, ()V, super, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8418
			requestor.getResults());
8418
			requestor.getResults());
8419
}
8419
}
8420
public void testCompletionKeywordSuper7() throws JavaModelException {
8420
public void testCompletionKeywordSuper7() throws JavaModelException {
Lines 8427-8435 Link Here
8427
		cu.codeComplete(cursorLocation, requestor);
8427
		cu.codeComplete(cursorLocation, requestor);
8428
8428
8429
		assertEquals(
8429
		assertEquals(
8430
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8430
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8431
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8431
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8432
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8432
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8433
			requestor.getResults());
8433
			requestor.getResults());
8434
}
8434
}
8435
public void testCompletionKeywordSuper8() throws JavaModelException {
8435
public void testCompletionKeywordSuper8() throws JavaModelException {
Lines 8442-8450 Link Here
8442
		cu.codeComplete(cursorLocation, requestor);
8442
		cu.codeComplete(cursorLocation, requestor);
8443
8443
8444
		assertEquals(
8444
		assertEquals(
8445
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8445
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8446
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8446
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8447
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8447
			"element:super    completion:super    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8448
			requestor.getResults());
8448
			requestor.getResults());
8449
}
8449
}
8450
public void testCompletionKeywordSuper9() throws JavaModelException {
8450
public void testCompletionKeywordSuper9() throws JavaModelException {
Lines 8457-8464 Link Here
8457
		cu.codeComplete(cursorLocation, requestor);
8457
		cu.codeComplete(cursorLocation, requestor);
8458
8458
8459
		assertEquals(
8459
		assertEquals(
8460
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8460
			"element:SuperClass    completion:SuperClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "\n" +
8461
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8461
			"element:SuperInterface    completion:SuperInterface    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8462
			requestor.getResults());
8462
			requestor.getResults());
8463
}
8463
}
8464
public void testCompletionKeywordSwitch1() throws JavaModelException {
8464
public void testCompletionKeywordSwitch1() throws JavaModelException {
Lines 8471-8477 Link Here
8471
		cu.codeComplete(cursorLocation, requestor);
8471
		cu.codeComplete(cursorLocation, requestor);
8472
8472
8473
		assertEquals(
8473
		assertEquals(
8474
			"element:switch    completion:switch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8474
			"element:switch    completion:switch    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8475
			requestor.getResults());
8475
			requestor.getResults());
8476
}
8476
}
8477
public void testCompletionKeywordSwitch2() throws JavaModelException {
8477
public void testCompletionKeywordSwitch2() throws JavaModelException {
Lines 8510-8516 Link Here
8510
		cu.codeComplete(cursorLocation, requestor);
8510
		cu.codeComplete(cursorLocation, requestor);
8511
8511
8512
		assertEquals(
8512
		assertEquals(
8513
			"element:switch    completion:switch    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8513
			"element:switch    completion:switch    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8514
			requestor.getResults());
8514
			requestor.getResults());
8515
}
8515
}
8516
public void testCompletionKeywordSwitch5() throws JavaModelException {
8516
public void testCompletionKeywordSwitch5() throws JavaModelException {
Lines 8549-8555 Link Here
8549
		cu.codeComplete(cursorLocation, requestor);
8549
		cu.codeComplete(cursorLocation, requestor);
8550
8550
8551
		assertEquals(
8551
		assertEquals(
8552
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8552
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8553
			requestor.getResults());
8553
			requestor.getResults());
8554
}
8554
}
8555
public void testCompletionKeywordSynchronized10() throws JavaModelException {
8555
public void testCompletionKeywordSynchronized10() throws JavaModelException {
Lines 8575-8581 Link Here
8575
		cu.codeComplete(cursorLocation, requestor);
8575
		cu.codeComplete(cursorLocation, requestor);
8576
8576
8577
		assertEquals(
8577
		assertEquals(
8578
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8578
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8579
			requestor.getResults());
8579
			requestor.getResults());
8580
}
8580
}
8581
public void testCompletionKeywordSynchronized12() throws JavaModelException {
8581
public void testCompletionKeywordSynchronized12() throws JavaModelException {
Lines 8614-8620 Link Here
8614
		cu.codeComplete(cursorLocation, requestor);
8614
		cu.codeComplete(cursorLocation, requestor);
8615
8615
8616
		assertEquals(
8616
		assertEquals(
8617
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8617
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8618
			requestor.getResults());
8618
			requestor.getResults());
8619
}
8619
}
8620
public void testCompletionKeywordSynchronized4() throws JavaModelException {
8620
public void testCompletionKeywordSynchronized4() throws JavaModelException {
Lines 8640-8646 Link Here
8640
		cu.codeComplete(cursorLocation, requestor);
8640
		cu.codeComplete(cursorLocation, requestor);
8641
8641
8642
		assertEquals(
8642
		assertEquals(
8643
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8643
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8644
			requestor.getResults());
8644
			requestor.getResults());
8645
}
8645
}
8646
public void testCompletionKeywordSynchronized6() throws JavaModelException {
8646
public void testCompletionKeywordSynchronized6() throws JavaModelException {
Lines 8666-8672 Link Here
8666
		cu.codeComplete(cursorLocation, requestor);
8666
		cu.codeComplete(cursorLocation, requestor);
8667
8667
8668
		assertEquals(
8668
		assertEquals(
8669
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8669
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8670
			requestor.getResults());
8670
			requestor.getResults());
8671
}
8671
}
8672
public void testCompletionKeywordSynchronized8() throws JavaModelException {
8672
public void testCompletionKeywordSynchronized8() throws JavaModelException {
Lines 8692-8698 Link Here
8692
		cu.codeComplete(cursorLocation, requestor);
8692
		cu.codeComplete(cursorLocation, requestor);
8693
8693
8694
		assertEquals(
8694
		assertEquals(
8695
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8695
			"element:synchronized    completion:synchronized    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8696
			requestor.getResults());
8696
			requestor.getResults());
8697
}
8697
}
8698
public void testCompletionKeywordThis1() throws JavaModelException {
8698
public void testCompletionKeywordThis1() throws JavaModelException {
Lines 8705-8711 Link Here
8705
		cu.codeComplete(cursorLocation, requestor);
8705
		cu.codeComplete(cursorLocation, requestor);
8706
8706
8707
		assertEquals(
8707
		assertEquals(
8708
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8708
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8709
			requestor.getResults());
8709
			requestor.getResults());
8710
}
8710
}
8711
public void testCompletionKeywordThis10() throws JavaModelException {
8711
public void testCompletionKeywordThis10() throws JavaModelException {
Lines 8731-8737 Link Here
8731
		cu.codeComplete(cursorLocation, requestor);
8731
		cu.codeComplete(cursorLocation, requestor);
8732
8732
8733
		assertEquals(
8733
		assertEquals(
8734
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8734
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8735
			requestor.getResults());
8735
			requestor.getResults());
8736
}
8736
}
8737
public void testCompletionKeywordThis12() throws JavaModelException {
8737
public void testCompletionKeywordThis12() throws JavaModelException {
Lines 8757-8763 Link Here
8757
		cu.codeComplete(cursorLocation, requestor);
8757
		cu.codeComplete(cursorLocation, requestor);
8758
8758
8759
		assertEquals(
8759
		assertEquals(
8760
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
8760
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
8761
			requestor.getResults());
8761
			requestor.getResults());
8762
}
8762
}
8763
public void testCompletionKeywordThis14() throws JavaModelException {
8763
public void testCompletionKeywordThis14() throws JavaModelException {
Lines 8795-8803 Link Here
8795
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
8795
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
8796
8796
8797
	assertResults(
8797
	assertResults(
8798
			"CompletionKeywordThis15.InnerClass[TYPE_REF]{InnerClass, , LCompletionKeywordThis15$InnerClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
8798
			"CompletionKeywordThis15.InnerClass[TYPE_REF]{InnerClass, , LCompletionKeywordThis15$InnerClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
8799
			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n"+
8799
			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n"+
8800
			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8800
			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8801
		requestor.getResults());
8801
		requestor.getResults());
8802
}
8802
}
8803
public void testCompletionKeywordThis2() throws JavaModelException {
8803
public void testCompletionKeywordThis2() throws JavaModelException {
Lines 8810-8816 Link Here
8810
		cu.codeComplete(cursorLocation, requestor);
8810
		cu.codeComplete(cursorLocation, requestor);
8811
8811
8812
		assertEquals(
8812
		assertEquals(
8813
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8813
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8814
			requestor.getResults());
8814
			requestor.getResults());
8815
}
8815
}
8816
public void testCompletionKeywordThis3() throws JavaModelException {
8816
public void testCompletionKeywordThis3() throws JavaModelException {
Lines 8836-8842 Link Here
8836
		cu.codeComplete(cursorLocation, requestor);
8836
		cu.codeComplete(cursorLocation, requestor);
8837
8837
8838
		assertEquals(
8838
		assertEquals(
8839
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8839
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8840
			requestor.getResults());
8840
			requestor.getResults());
8841
}
8841
}
8842
public void testCompletionKeywordThis5() throws JavaModelException {
8842
public void testCompletionKeywordThis5() throws JavaModelException {
Lines 8862-8868 Link Here
8862
		cu.codeComplete(cursorLocation, requestor);
8862
		cu.codeComplete(cursorLocation, requestor);
8863
8863
8864
		assertEquals(
8864
		assertEquals(
8865
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
8865
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED),
8866
			requestor.getResults());
8866
			requestor.getResults());
8867
}
8867
}
8868
public void testCompletionKeywordThis7() throws JavaModelException {
8868
public void testCompletionKeywordThis7() throws JavaModelException {
Lines 8888-8894 Link Here
8888
		cu.codeComplete(cursorLocation, requestor);
8888
		cu.codeComplete(cursorLocation, requestor);
8889
8889
8890
		assertEquals(
8890
		assertEquals(
8891
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8891
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8892
			requestor.getResults());
8892
			requestor.getResults());
8893
}
8893
}
8894
public void testCompletionKeywordThis9() throws JavaModelException {
8894
public void testCompletionKeywordThis9() throws JavaModelException {
Lines 8901-8907 Link Here
8901
		cu.codeComplete(cursorLocation, requestor);
8901
		cu.codeComplete(cursorLocation, requestor);
8902
8902
8903
		assertEquals(
8903
		assertEquals(
8904
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8904
			"element:this    completion:this    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8905
			requestor.getResults());
8905
			requestor.getResults());
8906
}
8906
}
8907
public void testCompletionKeywordThrow1() throws JavaModelException {
8907
public void testCompletionKeywordThrow1() throws JavaModelException {
Lines 8914-8921 Link Here
8914
		cu.codeComplete(cursorLocation, requestor);
8914
		cu.codeComplete(cursorLocation, requestor);
8915
8915
8916
		assertEquals(
8916
		assertEquals(
8917
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
8917
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
8918
			"element:throw    completion:throw    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8918
			"element:throw    completion:throw    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8919
			requestor.getResults());
8919
			requestor.getResults());
8920
}
8920
}
8921
public void testCompletionKeywordThrow2() throws JavaModelException {
8921
public void testCompletionKeywordThrow2() throws JavaModelException {
Lines 8928-8934 Link Here
8928
		cu.codeComplete(cursorLocation, requestor);
8928
		cu.codeComplete(cursorLocation, requestor);
8929
8929
8930
		assertEquals(
8930
		assertEquals(
8931
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8931
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8932
			requestor.getResults());
8932
			requestor.getResults());
8933
}
8933
}
8934
public void testCompletionKeywordThrow3() throws JavaModelException {
8934
public void testCompletionKeywordThrow3() throws JavaModelException {
Lines 8941-8947 Link Here
8941
		cu.codeComplete(cursorLocation, requestor);
8941
		cu.codeComplete(cursorLocation, requestor);
8942
8942
8943
		assertEquals(
8943
		assertEquals(
8944
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8944
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8945
			requestor.getResults());
8945
			requestor.getResults());
8946
}
8946
}
8947
public void testCompletionKeywordThrow4() throws JavaModelException {
8947
public void testCompletionKeywordThrow4() throws JavaModelException {
Lines 8954-8961 Link Here
8954
		cu.codeComplete(cursorLocation, requestor);
8954
		cu.codeComplete(cursorLocation, requestor);
8955
8955
8956
		assertEquals(
8956
		assertEquals(
8957
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
8957
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
8958
			"element:throw    completion:throw    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8958
			"element:throw    completion:throw    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8959
			requestor.getResults());
8959
			requestor.getResults());
8960
}
8960
}
8961
public void testCompletionKeywordThrow5() throws JavaModelException {
8961
public void testCompletionKeywordThrow5() throws JavaModelException {
Lines 8968-8974 Link Here
8968
		cu.codeComplete(cursorLocation, requestor);
8968
		cu.codeComplete(cursorLocation, requestor);
8969
8969
8970
		assertEquals(
8970
		assertEquals(
8971
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8971
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8972
			requestor.getResults());
8972
			requestor.getResults());
8973
}
8973
}
8974
public void testCompletionKeywordThrow6() throws JavaModelException {
8974
public void testCompletionKeywordThrow6() throws JavaModelException {
Lines 8981-8987 Link Here
8981
		cu.codeComplete(cursorLocation, requestor);
8981
		cu.codeComplete(cursorLocation, requestor);
8982
8982
8983
		assertEquals(
8983
		assertEquals(
8984
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8984
			"element:Throwable    completion:Throwable    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
8985
			requestor.getResults());
8985
			requestor.getResults());
8986
}
8986
}
8987
public void testCompletionKeywordThrows1() throws JavaModelException {
8987
public void testCompletionKeywordThrows1() throws JavaModelException {
Lines 8994-9000 Link Here
8994
		cu.codeComplete(cursorLocation, requestor);
8994
		cu.codeComplete(cursorLocation, requestor);
8995
8995
8996
		assertEquals(
8996
		assertEquals(
8997
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8997
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
8998
			requestor.getResults());
8998
			requestor.getResults());
8999
}
8999
}
9000
public void testCompletionKeywordThrows2() throws JavaModelException {
9000
public void testCompletionKeywordThrows2() throws JavaModelException {
Lines 9020-9026 Link Here
9020
		cu.codeComplete(cursorLocation, requestor);
9020
		cu.codeComplete(cursorLocation, requestor);
9021
9021
9022
		assertEquals(
9022
		assertEquals(
9023
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9023
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9024
			requestor.getResults());
9024
			requestor.getResults());
9025
}
9025
}
9026
public void testCompletionKeywordThrows4() throws JavaModelException {
9026
public void testCompletionKeywordThrows4() throws JavaModelException {
Lines 9033-9039 Link Here
9033
		cu.codeComplete(cursorLocation, requestor);
9033
		cu.codeComplete(cursorLocation, requestor);
9034
9034
9035
		assertEquals(
9035
		assertEquals(
9036
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9036
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9037
			requestor.getResults());
9037
			requestor.getResults());
9038
}
9038
}
9039
public void testCompletionKeywordThrows5() throws JavaModelException {
9039
public void testCompletionKeywordThrows5() throws JavaModelException {
Lines 9046-9052 Link Here
9046
		cu.codeComplete(cursorLocation, requestor);
9046
		cu.codeComplete(cursorLocation, requestor);
9047
9047
9048
		assertEquals(
9048
		assertEquals(
9049
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9049
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9050
			requestor.getResults());
9050
			requestor.getResults());
9051
}
9051
}
9052
public void testCompletionKeywordThrows6() throws JavaModelException {
9052
public void testCompletionKeywordThrows6() throws JavaModelException {
Lines 9072-9078 Link Here
9072
		cu.codeComplete(cursorLocation, requestor);
9072
		cu.codeComplete(cursorLocation, requestor);
9073
9073
9074
		assertEquals(
9074
		assertEquals(
9075
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9075
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9076
			requestor.getResults());
9076
			requestor.getResults());
9077
}
9077
}
9078
public void testCompletionKeywordThrows8() throws JavaModelException {
9078
public void testCompletionKeywordThrows8() throws JavaModelException {
Lines 9085-9091 Link Here
9085
		cu.codeComplete(cursorLocation, requestor);
9085
		cu.codeComplete(cursorLocation, requestor);
9086
9086
9087
		assertEquals(
9087
		assertEquals(
9088
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9088
			"element:throws    completion:throws    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9089
			requestor.getResults());
9089
			requestor.getResults());
9090
}
9090
}
9091
public void testCompletionKeywordTransient1() throws JavaModelException {
9091
public void testCompletionKeywordTransient1() throws JavaModelException {
Lines 9098-9104 Link Here
9098
		cu.codeComplete(cursorLocation, requestor);
9098
		cu.codeComplete(cursorLocation, requestor);
9099
9099
9100
		assertEquals(
9100
		assertEquals(
9101
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9101
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9102
			requestor.getResults());
9102
			requestor.getResults());
9103
}
9103
}
9104
public void testCompletionKeywordTransient2() throws JavaModelException {
9104
public void testCompletionKeywordTransient2() throws JavaModelException {
Lines 9124-9130 Link Here
9124
		cu.codeComplete(cursorLocation, requestor);
9124
		cu.codeComplete(cursorLocation, requestor);
9125
9125
9126
		assertEquals(
9126
		assertEquals(
9127
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9127
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9128
			requestor.getResults());
9128
			requestor.getResults());
9129
}
9129
}
9130
public void testCompletionKeywordTransient4() throws JavaModelException {
9130
public void testCompletionKeywordTransient4() throws JavaModelException {
Lines 9150-9156 Link Here
9150
		cu.codeComplete(cursorLocation, requestor);
9150
		cu.codeComplete(cursorLocation, requestor);
9151
9151
9152
		assertEquals(
9152
		assertEquals(
9153
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9153
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9154
			requestor.getResults());
9154
			requestor.getResults());
9155
}
9155
}
9156
public void testCompletionKeywordTransient6() throws JavaModelException {
9156
public void testCompletionKeywordTransient6() throws JavaModelException {
Lines 9176-9182 Link Here
9176
		cu.codeComplete(cursorLocation, requestor);
9176
		cu.codeComplete(cursorLocation, requestor);
9177
9177
9178
		assertEquals(
9178
		assertEquals(
9179
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9179
			"element:transient    completion:transient    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9180
			requestor.getResults());
9180
			requestor.getResults());
9181
}
9181
}
9182
public void testCompletionKeywordTransient8() throws JavaModelException {
9182
public void testCompletionKeywordTransient8() throws JavaModelException {
Lines 9215-9221 Link Here
9215
		cu.codeComplete(cursorLocation, requestor);
9215
		cu.codeComplete(cursorLocation, requestor);
9216
9216
9217
		assertEquals(
9217
		assertEquals(
9218
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9218
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9219
			requestor.getResults());
9219
			requestor.getResults());
9220
}
9220
}
9221
public void testCompletionKeywordTrue3() throws JavaModelException {
9221
public void testCompletionKeywordTrue3() throws JavaModelException {
Lines 9241-9247 Link Here
9241
		cu.codeComplete(cursorLocation, requestor);
9241
		cu.codeComplete(cursorLocation, requestor);
9242
9242
9243
		assertEquals(
9243
		assertEquals(
9244
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9244
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9245
			requestor.getResults());
9245
			requestor.getResults());
9246
}
9246
}
9247
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
9247
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
Lines 9264-9270 Link Here
9264
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9264
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9265
9265
9266
	assertResults(
9266
	assertResults(
9267
			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
9267
			"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
9268
			requestor.getResults());
9268
			requestor.getResults());
9269
}
9269
}
9270
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
9270
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=90615
Lines 9288-9327 Link Here
9288
9288
9289
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
9289
	if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
9290
		assertResults(
9290
		assertResults(
9291
				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9291
				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9292
				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9292
				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9293
				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9293
				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9294
				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9294
				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9295
				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9295
				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9296
				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9296
				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9297
				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9297
				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9298
				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9298
				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9299
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9299
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9300
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9300
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9301
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9301
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9302
				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9302
				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9303
				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9303
				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9304
				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
9304
				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
9305
				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
9305
				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
9306
				requestor.getResults());
9306
				requestor.getResults());
9307
	} else {
9307
	} else {
9308
		assertResults(
9308
		assertResults(
9309
				"CompletionKeywordTrue6[TYPE_REF]{CompletionKeywordTrue6, test, Ltest.CompletionKeywordTrue6;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9309
				"CompletionKeywordTrue6[TYPE_REF]{CompletionKeywordTrue6, test, Ltest.CompletionKeywordTrue6;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9310
				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9310
				"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9311
				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9311
				"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9312
				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9312
				"foo[METHOD_REF]{foo(), Ltest.CompletionKeywordTrue6;, ()V, foo, null, " +(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9313
				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9313
				"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9314
				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9314
				"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9315
				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9315
				"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9316
				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9316
				"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9317
				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9317
				"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9318
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9318
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9319
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9319
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (J)V, wait, (millis), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9320
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9320
				"wait[METHOD_REF]{wait(), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
9321
				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9321
				"equals[METHOD_REF]{equals(), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9322
				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9322
				"var[LOCAL_VARIABLE_REF]{var, null, Z, var, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}\n"+
9323
				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
9323
				"false[KEYWORD]{false, null, null, false, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED)+"}\n"+
9324
				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
9324
				"true[KEYWORD]{true, null, null, true, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_TRUE_OR_FALSE + R_NON_RESTRICTED) + "}",
9325
				requestor.getResults());
9325
				requestor.getResults());
9326
	}
9326
	}
9327
}
9327
}
Lines 9335-9341 Link Here
9335
		cu.codeComplete(cursorLocation, requestor);
9335
		cu.codeComplete(cursorLocation, requestor);
9336
9336
9337
		assertEquals(
9337
		assertEquals(
9338
			"element:try    completion:try    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9338
			"element:try    completion:try    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9339
			requestor.getResults());
9339
			requestor.getResults());
9340
}
9340
}
9341
public void testCompletionKeywordTry2() throws JavaModelException {
9341
public void testCompletionKeywordTry2() throws JavaModelException {
Lines 9348-9354 Link Here
9348
		cu.codeComplete(cursorLocation, requestor);
9348
		cu.codeComplete(cursorLocation, requestor);
9349
9349
9350
		assertEquals(
9350
		assertEquals(
9351
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9351
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9352
			requestor.getResults());
9352
			requestor.getResults());
9353
}
9353
}
9354
public void testCompletionKeywordTry3() throws JavaModelException {
9354
public void testCompletionKeywordTry3() throws JavaModelException {
Lines 9374-9380 Link Here
9374
		cu.codeComplete(cursorLocation, requestor);
9374
		cu.codeComplete(cursorLocation, requestor);
9375
9375
9376
		assertEquals(
9376
		assertEquals(
9377
			"element:try    completion:try    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9377
			"element:try    completion:try    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9378
			requestor.getResults());
9378
			requestor.getResults());
9379
}
9379
}
9380
public void testCompletionKeywordTry5() throws JavaModelException {
9380
public void testCompletionKeywordTry5() throws JavaModelException {
Lines 9387-9393 Link Here
9387
		cu.codeComplete(cursorLocation, requestor);
9387
		cu.codeComplete(cursorLocation, requestor);
9388
9388
9389
		assertEquals(
9389
		assertEquals(
9390
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9390
			"element:true    completion:true    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
9391
			requestor.getResults());
9391
			requestor.getResults());
9392
}
9392
}
9393
public void testCompletionKeywordTry6() throws JavaModelException {
9393
public void testCompletionKeywordTry6() throws JavaModelException {
Lines 9413-9419 Link Here
9413
		cu.codeComplete(cursorLocation, requestor);
9413
		cu.codeComplete(cursorLocation, requestor);
9414
9414
9415
		assertEquals(
9415
		assertEquals(
9416
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9416
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9417
			requestor.getResults());
9417
			requestor.getResults());
9418
}
9418
}
9419
public void testCompletionKeywordVolatile2() throws JavaModelException {
9419
public void testCompletionKeywordVolatile2() throws JavaModelException {
Lines 9439-9445 Link Here
9439
		cu.codeComplete(cursorLocation, requestor);
9439
		cu.codeComplete(cursorLocation, requestor);
9440
9440
9441
		assertEquals(
9441
		assertEquals(
9442
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9442
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9443
			requestor.getResults());
9443
			requestor.getResults());
9444
}
9444
}
9445
public void testCompletionKeywordVolatile4() throws JavaModelException {
9445
public void testCompletionKeywordVolatile4() throws JavaModelException {
Lines 9465-9471 Link Here
9465
		cu.codeComplete(cursorLocation, requestor);
9465
		cu.codeComplete(cursorLocation, requestor);
9466
9466
9467
		assertEquals(
9467
		assertEquals(
9468
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9468
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9469
			requestor.getResults());
9469
			requestor.getResults());
9470
}
9470
}
9471
public void testCompletionKeywordVolatile6() throws JavaModelException {
9471
public void testCompletionKeywordVolatile6() throws JavaModelException {
Lines 9491-9497 Link Here
9491
		cu.codeComplete(cursorLocation, requestor);
9491
		cu.codeComplete(cursorLocation, requestor);
9492
9492
9493
		assertEquals(
9493
		assertEquals(
9494
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9494
			"element:volatile    completion:volatile    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9495
			requestor.getResults());
9495
			requestor.getResults());
9496
}
9496
}
9497
public void testCompletionKeywordVolatile8() throws JavaModelException {
9497
public void testCompletionKeywordVolatile8() throws JavaModelException {
Lines 9517-9523 Link Here
9517
		cu.codeComplete(cursorLocation, requestor);
9517
		cu.codeComplete(cursorLocation, requestor);
9518
9518
9519
		assertEquals(
9519
		assertEquals(
9520
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9520
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9521
			requestor.getResults());
9521
			requestor.getResults());
9522
}
9522
}
9523
public void testCompletionKeywordWhile10() throws JavaModelException {
9523
public void testCompletionKeywordWhile10() throws JavaModelException {
Lines 9530-9536 Link Here
9530
		cu.codeComplete(cursorLocation, requestor);
9530
		cu.codeComplete(cursorLocation, requestor);
9531
9531
9532
		assertEquals(
9532
		assertEquals(
9533
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9533
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9534
			requestor.getResults());
9534
			requestor.getResults());
9535
}
9535
}
9536
public void testCompletionKeywordWhile2() throws JavaModelException {
9536
public void testCompletionKeywordWhile2() throws JavaModelException {
Lines 9569-9575 Link Here
9569
		cu.codeComplete(cursorLocation, requestor);
9569
		cu.codeComplete(cursorLocation, requestor);
9570
9570
9571
		assertEquals(
9571
		assertEquals(
9572
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9572
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9573
			requestor.getResults());
9573
			requestor.getResults());
9574
}
9574
}
9575
public void testCompletionKeywordWhile5() throws JavaModelException {
9575
public void testCompletionKeywordWhile5() throws JavaModelException {
Lines 9582-9588 Link Here
9582
		cu.codeComplete(cursorLocation, requestor);
9582
		cu.codeComplete(cursorLocation, requestor);
9583
9583
9584
		assertEquals(
9584
		assertEquals(
9585
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9585
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9586
			requestor.getResults());
9586
			requestor.getResults());
9587
}
9587
}
9588
public void testCompletionKeywordWhile6() throws JavaModelException {
9588
public void testCompletionKeywordWhile6() throws JavaModelException {
Lines 9595-9601 Link Here
9595
		cu.codeComplete(cursorLocation, requestor);
9595
		cu.codeComplete(cursorLocation, requestor);
9596
9596
9597
		assertEquals(
9597
		assertEquals(
9598
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9598
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9599
			requestor.getResults());
9599
			requestor.getResults());
9600
}
9600
}
9601
public void testCompletionKeywordWhile7() throws JavaModelException {
9601
public void testCompletionKeywordWhile7() throws JavaModelException {
Lines 9634-9640 Link Here
9634
		cu.codeComplete(cursorLocation, requestor);
9634
		cu.codeComplete(cursorLocation, requestor);
9635
9635
9636
		assertEquals(
9636
		assertEquals(
9637
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9637
			"element:while    completion:while    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
9638
			requestor.getResults());
9638
			requestor.getResults());
9639
}
9639
}
9640
public void testCompletionLocalName() throws JavaModelException {
9640
public void testCompletionLocalName() throws JavaModelException {
Lines 9673-9680 Link Here
9673
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9673
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9674
9674
9675
	assertResults(
9675
	assertResults(
9676
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, LZZZZ;, ()V, ZZZ, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
9676
			"ZZZ[POTENTIAL_METHOD_DECLARATION]{ZZZ, LZZZZ;, ()V, ZZZ, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
9677
			"ZZZZ[TYPE_REF]{ZZZZ, , LZZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
9677
			"ZZZZ[TYPE_REF]{ZZZZ, , LZZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}",
9678
			requestor.getResults());
9678
			requestor.getResults());
9679
}
9679
}
9680
/*
9680
/*
Lines 9699-9705 Link Here
9699
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9699
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9700
9700
9701
    assertResults(
9701
    assertResults(
9702
		"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
9702
		"CompletionMemberType.Y[TYPE_REF]{Y, , LCompletionMemberType$Y;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
9703
		requestor.getResults());
9703
		requestor.getResults());
9704
}
9704
}
9705
public void testCompletionMemberType2() throws JavaModelException {
9705
public void testCompletionMemberType2() throws JavaModelException {
Lines 9726-9732 Link Here
9726
			requestor.getResults());
9726
			requestor.getResults());
9727
	} else {
9727
	} else {
9728
		assertResults(
9728
		assertResults(
9729
			"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",
9729
			"CompletionMemberType2.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType2$MemberException;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXCEPTION+ R_NON_RESTRICTED)+"}",
9730
			requestor.getResults());
9730
			requestor.getResults());
9731
	}
9731
	}
9732
}
9732
}
Lines 9749-9755 Link Here
9749
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9749
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9750
9750
9751
	assertResults(
9751
	assertResults(
9752
		"CompletionMemberType3.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
9752
		"CompletionMemberType3.MemberException[TYPE_REF]{MemberException, test, Ltest.CompletionMemberType3$MemberException;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION+ R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
9753
		requestor.getResults());
9753
		requestor.getResults());
9754
}
9754
}
9755
public void testCompletionMessageSendIsParent1() throws JavaModelException {
9755
public void testCompletionMessageSendIsParent1() throws JavaModelException {
Lines 9762-9772 Link Here
9762
	cu.codeComplete(cursorLocation, requestor);
9762
	cu.codeComplete(cursorLocation, requestor);
9763
9763
9764
	assertEquals(
9764
	assertEquals(
9765
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9765
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9766
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9766
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9767
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9767
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9768
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9768
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9769
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9769
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9770
		requestor.getResults());
9770
		requestor.getResults());
9771
}
9771
}
9772
public void testCompletionMessageSendIsParent2() throws JavaModelException {
9772
public void testCompletionMessageSendIsParent2() throws JavaModelException {
Lines 9779-9789 Link Here
9779
	cu.codeComplete(cursorLocation, requestor);
9779
	cu.codeComplete(cursorLocation, requestor);
9780
9780
9781
	assertEquals(
9781
	assertEquals(
9782
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9782
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9783
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9783
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9784
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9784
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9785
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9785
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9786
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9786
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9787
		requestor.getResults());
9787
		requestor.getResults());
9788
}
9788
}
9789
public void testCompletionMessageSendIsParent3() throws JavaModelException {
9789
public void testCompletionMessageSendIsParent3() throws JavaModelException {
Lines 9796-9806 Link Here
9796
	cu.codeComplete(cursorLocation, requestor);
9796
	cu.codeComplete(cursorLocation, requestor);
9797
9797
9798
	assertEquals(
9798
	assertEquals(
9799
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9799
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9800
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9800
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9801
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9801
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9802
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9802
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9803
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9803
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9804
		requestor.getResults());
9804
		requestor.getResults());
9805
}
9805
}
9806
public void testCompletionMessageSendIsParent4() throws JavaModelException {
9806
public void testCompletionMessageSendIsParent4() throws JavaModelException {
Lines 9813-9823 Link Here
9813
	cu.codeComplete(cursorLocation, requestor);
9813
	cu.codeComplete(cursorLocation, requestor);
9814
9814
9815
	assertEquals(
9815
	assertEquals(
9816
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9816
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9817
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9817
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9818
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9818
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9819
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9819
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9820
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9820
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9821
		requestor.getResults());
9821
		requestor.getResults());
9822
}
9822
}
9823
public void testCompletionMessageSendIsParent5() throws JavaModelException {
9823
public void testCompletionMessageSendIsParent5() throws JavaModelException {
Lines 9830-9840 Link Here
9830
	cu.codeComplete(cursorLocation, requestor);
9830
	cu.codeComplete(cursorLocation, requestor);
9831
9831
9832
	assertEquals(
9832
	assertEquals(
9833
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9833
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9834
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9834
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9835
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9835
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9836
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9836
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9837
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9837
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9838
		requestor.getResults());
9838
		requestor.getResults());
9839
}
9839
}
9840
public void testCompletionMessageSendIsParent6() throws JavaModelException {
9840
public void testCompletionMessageSendIsParent6() throws JavaModelException {
Lines 9847-9857 Link Here
9847
	cu.codeComplete(cursorLocation, requestor);
9847
	cu.codeComplete(cursorLocation, requestor);
9848
9848
9849
	assertEquals(
9849
	assertEquals(
9850
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9850
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9851
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9851
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9852
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9852
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9853
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9853
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
9854
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9854
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
9855
		requestor.getResults());
9855
		requestor.getResults());
9856
}
9856
}
9857
public void testCompletionMethodDeclaration() throws JavaModelException {
9857
public void testCompletionMethodDeclaration() throws JavaModelException {
Lines 9866-9873 Link Here
9866
9866
9867
	assertEquals(
9867
	assertEquals(
9868
		"should have two completions", 
9868
		"should have two completions", 
9869
		"element:eqFoo    completion:public int eqFoo(int a, Object b)    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"\n" +
9869
		"element:eqFoo    completion:public int eqFoo(int a, Object b)    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"\n" +
9870
		"element:equals    completion:public boolean equals(Object obj)    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
9870
		"element:equals    completion:public boolean equals(Object obj)    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
9871
		requestor.getResults());
9871
		requestor.getResults());
9872
}
9872
}
9873
public void testCompletionMethodDeclaration10() throws JavaModelException {
9873
public void testCompletionMethodDeclaration10() throws JavaModelException {
Lines 9882-9889 Link Here
9882
9882
9883
	assertEquals(
9883
	assertEquals(
9884
		"should have one completion", 
9884
		"should have one completion", 
9885
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
9885
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
9886
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
9886
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
9887
		requestor.getResults());
9887
		requestor.getResults());
9888
}
9888
}
9889
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=80063
9889
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=80063
Lines 9907-9913 Link Here
9907
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9907
	this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9908
9908
9909
	assertResults(
9909
	assertResults(
9910
			"fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration11_2;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
9910
			"fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration11_2;, ()V, fo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
9911
			requestor.getResults());
9911
			requestor.getResults());
9912
}
9912
}
9913
public void testCompletionMethodDeclaration12() throws JavaModelException {
9913
public void testCompletionMethodDeclaration12() throws JavaModelException {
Lines 9934-9940 Link Here
9934
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9934
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9935
9935
9936
    assertResults(
9936
    assertResults(
9937
            "fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration12_3;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
9937
            "fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.CompletionMethodDeclaration12_3;, ()V, fo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
9938
            requestor.getResults());
9938
            requestor.getResults());
9939
}
9939
}
9940
public void testCompletionMethodDeclaration2() throws JavaModelException {
9940
public void testCompletionMethodDeclaration2() throws JavaModelException {
Lines 9963-9971 Link Here
9963
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9963
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
9964
	
9964
	
9965
		assertResults(
9965
		assertResults(
9966
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration2;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
9966
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration2;, ()V, eq, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
9967
			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
9967
			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n" +
9968
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
9968
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
9969
			requestor.getResults());
9969
			requestor.getResults());
9970
	} finally {
9970
	} finally {
9971
		if(superClass != null) {
9971
		if(superClass != null) {
Lines 10006-10013 Link Here
10006
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10006
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10007
	
10007
	
10008
		assertResults(
10008
		assertResults(
10009
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration3;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10009
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration3;, ()V, eq, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10010
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
10010
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
10011
			requestor.getResults());
10011
			requestor.getResults());
10012
	} finally {
10012
	} finally {
10013
		if(superClass != null) {
10013
		if(superClass != null) {
Lines 10038-10046 Link Here
10038
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10038
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10039
	
10039
	
10040
		assertResults(
10040
		assertResults(
10041
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration4;, ()V, eq, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10041
			"eq[POTENTIAL_METHOD_DECLARATION]{eq, LCompletionMethodDeclaration4;, ()V, eq, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10042
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10042
			"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10043
			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
10043
			"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperInterface;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ABSTRACT_METHOD + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+"}",
10044
			requestor.getResults());
10044
			requestor.getResults());
10045
	} finally {
10045
	} finally {
10046
		if(superClass != null) {
10046
		if(superClass != null) {
Lines 10078-10101 Link Here
10078
	
10078
	
10079
	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
10079
	    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
10080
			assertResults(
10080
			assertResults(
10081
				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10081
				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10082
				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10082
				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10083
				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10083
				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10084
				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10084
				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10085
				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10085
				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10086
				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10086
				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10087
				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
10087
				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
10088
				requestor.getResults());
10088
				requestor.getResults());
10089
		} else {
10089
		} else {
10090
			assertResults(
10090
			assertResults(
10091
				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10091
				"[POTENTIAL_METHOD_DECLARATION]{, LCompletionSuperClass;, ()V, , null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n" +
10092
				"CompletionMethodDeclaration5[TYPE_REF]{CompletionMethodDeclaration5, , LCompletionMethodDeclaration5;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
10092
				"CompletionMethodDeclaration5[TYPE_REF]{CompletionMethodDeclaration5, , LCompletionMethodDeclaration5;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
10093
				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10093
				"clone[METHOD_DECLARATION]{protected Object clone() throws CloneNotSupportedException, Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10094
				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10094
				"eqFoo[METHOD_DECLARATION]{public int eqFoo(int a, Object b), LCompletionSuperClass;, (ILjava.lang.Object;)I, eqFoo, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10095
				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10095
				"equals[METHOD_DECLARATION]{public boolean equals(Object obj), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10096
				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10096
				"finalize[METHOD_DECLARATION]{protected void finalize() throws Throwable, Ljava.lang.Object;, ()V, finalize, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10097
				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10097
				"hashCode[METHOD_DECLARATION]{public int hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED)+"}\n"+
10098
				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
10098
				"toString[METHOD_DECLARATION]{public String toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED)+ "}",
10099
				requestor.getResults());
10099
				requestor.getResults());
10100
		}
10100
		}
10101
	} finally {
10101
	} finally {
Lines 10116-10122 Link Here
10116
10116
10117
	assertEquals(
10117
	assertEquals(
10118
		"should have one completion", 
10118
		"should have one completion", 
10119
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
10119
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
10120
		requestor.getResults());
10120
		requestor.getResults());
10121
}
10121
}
10122
public void testCompletionMethodDeclaration7() throws JavaModelException {
10122
public void testCompletionMethodDeclaration7() throws JavaModelException {
Lines 10131-10138 Link Here
10131
10131
10132
	assertEquals(
10132
	assertEquals(
10133
		"should have one completion", 
10133
		"should have one completion", 
10134
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
10134
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
10135
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
10135
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
10136
		requestor.getResults());
10136
		requestor.getResults());
10137
}
10137
}
10138
public void testCompletionMethodDeclaration8() throws JavaModelException {
10138
public void testCompletionMethodDeclaration8() throws JavaModelException {
Lines 10147-10154 Link Here
10147
10147
10148
	assertEquals(
10148
	assertEquals(
10149
		"should have one completion", 
10149
		"should have one completion", 
10150
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
10150
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
10151
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
10151
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
10152
		requestor.getResults());
10152
		requestor.getResults());
10153
}
10153
}
10154
public void testCompletionMethodDeclaration9() throws JavaModelException {
10154
public void testCompletionMethodDeclaration9() throws JavaModelException {
Lines 10163-10170 Link Here
10163
10163
10164
	assertEquals(
10164
	assertEquals(
10165
		"should have one completion", 
10165
		"should have one completion", 
10166
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
10166
		"element:CloneNotSupportedException    completion:CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
10167
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
10167
		"element:clone    completion:protected Object clone() throws CloneNotSupportedException    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE+ R_NON_RESTRICTED),
10168
		requestor.getResults());
10168
		requestor.getResults());
10169
}
10169
}
10170
public void testCompletionMethodThrowsClause() throws JavaModelException {
10170
public void testCompletionMethodThrowsClause() throws JavaModelException {
Lines 10177-10183 Link Here
10177
	cu.codeComplete(cursorLocation, requestor);
10177
	cu.codeComplete(cursorLocation, requestor);
10178
10178
10179
	assertEquals(
10179
	assertEquals(
10180
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
10180
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
10181
		requestor.getResults());
10181
		requestor.getResults());
10182
}
10182
}
10183
public void testCompletionMethodThrowsClause2() throws JavaModelException {
10183
public void testCompletionMethodThrowsClause2() throws JavaModelException {
Lines 10190-10196 Link Here
10190
	cu.codeComplete(cursorLocation, requestor);
10190
	cu.codeComplete(cursorLocation, requestor);
10191
10191
10192
	assertEquals(
10192
	assertEquals(
10193
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION+ R_NON_RESTRICTED),
10193
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION+ R_NON_RESTRICTED),
10194
		requestor.getResults());
10194
		requestor.getResults());
10195
}
10195
}
10196
public void testCompletionNonEmptyToken1() throws JavaModelException {
10196
public void testCompletionNonEmptyToken1() throws JavaModelException {
Lines 10205-10211 Link Here
10205
	cu.codeComplete(cursorLocation, requestor);
10205
	cu.codeComplete(cursorLocation, requestor);
10206
10206
10207
	assertEquals(
10207
	assertEquals(
10208
		"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10208
		"element:zzyy    completion:zzyy    position:["+start+","+end+"]    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10209
		requestor.getResultsWithPosition());
10209
		requestor.getResultsWithPosition());
10210
}
10210
}
10211
public void testCompletionNonStaticFieldRelevance() throws JavaModelException {
10211
public void testCompletionNonStaticFieldRelevance() throws JavaModelException {
Lines 10218-10225 Link Here
10218
	cu.codeComplete(cursorLocation, requestor);
10218
	cu.codeComplete(cursorLocation, requestor);
10219
10219
10220
	assertEquals(
10220
	assertEquals(
10221
			"element:Ii0    completion:Ii0    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
10221
			"element:Ii0    completion:Ii0    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
10222
			"element:ii1    completion:ii1    relevance:" + (R_DEFAULT + R_INTERESTING + R_NON_STATIC+ R_NON_RESTRICTED),
10222
			"element:ii1    completion:ii1    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_STATIC+ R_NON_RESTRICTED),
10223
			requestor.getResults());
10223
			requestor.getResults());
10224
}
10224
}
10225
/**
10225
/**
Lines 10247-10253 Link Here
10247
	cu.codeComplete(cursorLocation, requestor);
10247
	cu.codeComplete(cursorLocation, requestor);
10248
10248
10249
	assertEquals(
10249
	assertEquals(
10250
		"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
10250
		"element:hashCode    completion:hashCode()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED),
10251
		requestor.getResults());
10251
		requestor.getResults());
10252
}
10252
}
10253
/**
10253
/**
Lines 10263-10269 Link Here
10263
	cu.codeComplete(cursorLocation, requestor);
10263
	cu.codeComplete(cursorLocation, requestor);
10264
	assertEquals(
10264
	assertEquals(
10265
		"should have one class", 
10265
		"should have one class", 
10266
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10266
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10267
		requestor.getResults());
10267
		requestor.getResults());
10268
}
10268
}
10269
/*
10269
/*
Lines 10279-10286 Link Here
10279
		cu.codeComplete(cursorLocation, requestor);
10279
		cu.codeComplete(cursorLocation, requestor);
10280
10280
10281
		assertEquals(
10281
		assertEquals(
10282
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
10282
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
10283
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
10283
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
10284
			requestor.getResults());
10284
			requestor.getResults());
10285
}
10285
}
10286
/*
10286
/*
Lines 10296-10303 Link Here
10296
		cu.codeComplete(cursorLocation, requestor);
10296
		cu.codeComplete(cursorLocation, requestor);
10297
10297
10298
		assertEquals(
10298
		assertEquals(
10299
			"element:method1    completion:method1()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
10299
			"element:method1    completion:method1()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
10300
			"element:method2    completion:method2()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
10300
			"element:method2    completion:method2()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
10301
			requestor.getResults());
10301
			requestor.getResults());
10302
}
10302
}
10303
/**
10303
/**
Lines 10323-10331 Link Here
10323
	cu.codeComplete(cursorLocation, requestor);
10323
	cu.codeComplete(cursorLocation, requestor);
10324
10324
10325
	assertEquals(
10325
	assertEquals(
10326
			"element:Qla1    completion:z1.z2.Qla1    relevance:" + (R_DEFAULT + R_INTERESTING + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
10326
			"element:Qla1    completion:z1.z2.Qla1    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
10327
			"element:qla2    completion:z1.z2.qla2    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
10327
			"element:qla2    completion:z1.z2.qla2    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED + R_NON_RESTRICTED) + "\n" +
10328
			"element:z1.z2.qla0    completion:z1.z2.qla0    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED),
10328
			"element:z1.z2.qla0    completion:z1.z2.qla0    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_QUALIFIED+ R_NON_RESTRICTED),
10329
			requestor.getResults());
10329
			requestor.getResults());
10330
}
10330
}
10331
public void testCompletionPackageAndClass2() throws JavaModelException {
10331
public void testCompletionPackageAndClass2() throws JavaModelException {
Lines 10338-10346 Link Here
10338
	cu.codeComplete(cursorLocation, requestor);
10338
	cu.codeComplete(cursorLocation, requestor);
10339
10339
10340
	assertEquals(
10340
	assertEquals(
10341
			"element:Qla3    completion:Qla3    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
10341
			"element:Qla3    completion:Qla3    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
10342
			"element:Qla4    completion:Qla4    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
10342
			"element:Qla4    completion:Qla4    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "\n" +
10343
			"element:Wla    completion:Wla    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
10343
			"element:Wla    completion:Wla    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
10344
			requestor.getResults());
10344
			requestor.getResults());
10345
}
10345
}
10346
public void testCompletionPrefixFieldName1() throws JavaModelException {
10346
public void testCompletionPrefixFieldName1() throws JavaModelException {
Lines 10366-10373 Link Here
10366
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10366
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10367
10367
10368
	assertResults(
10368
	assertResults(
10369
		"xBar[FIELD_REF]{CompletionPrefixFieldName1.this.xBar, LCompletionPrefixFieldName1;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
10369
		"xBar[FIELD_REF]{CompletionPrefixFieldName1.this.xBar, LCompletionPrefixFieldName1;, I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
10370
		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName1$classFoo;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
10370
		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName1$classFoo;, I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
10371
		requestor.getResults());
10371
		requestor.getResults());
10372
}
10372
}
10373
public void testCompletionPrefixFieldName2() throws JavaModelException {
10373
public void testCompletionPrefixFieldName2() throws JavaModelException {
Lines 10393-10399 Link Here
10393
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10393
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10394
10394
10395
	assertResults(
10395
	assertResults(
10396
		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName2;, I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
10396
		"xBar[FIELD_REF]{xBar, LCompletionPrefixFieldName2;, I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
10397
		requestor.getResults());
10397
		requestor.getResults());
10398
}
10398
}
10399
public void testCompletionPrefixMethodName1() throws JavaModelException {
10399
public void testCompletionPrefixMethodName1() throws JavaModelException {
Lines 10419-10426 Link Here
10419
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10419
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10420
10420
10421
	assertResults(
10421
	assertResults(
10422
		"xBar[METHOD_REF]{CompletionPrefixMethodName1.this.xBar(), LCompletionPrefixMethodName1;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
10422
		"xBar[METHOD_REF]{CompletionPrefixMethodName1.this.xBar(), LCompletionPrefixMethodName1;, ()I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
10423
		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName1$classFoo;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
10423
		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName1$classFoo;, ()I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED)+"}",
10424
		requestor.getResults());
10424
		requestor.getResults());
10425
}
10425
}
10426
public void testCompletionPrefixMethodName2() throws JavaModelException {
10426
public void testCompletionPrefixMethodName2() throws JavaModelException {
Lines 10446-10452 Link Here
10446
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10446
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10447
10447
10448
	assertResults(
10448
	assertResults(
10449
		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName2;, ()I, xBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
10449
		"xBar[METHOD_REF]{xBar(), LCompletionPrefixMethodName2;, ()I, xBar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED)+"}",
10450
		requestor.getResults());
10450
		requestor.getResults());
10451
}
10451
}
10452
public void testCompletionPrefixMethodName3() throws JavaModelException {
10452
public void testCompletionPrefixMethodName3() throws JavaModelException {
Lines 10472-10479 Link Here
10472
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10472
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10473
10473
10474
	assertResults(
10474
	assertResults(
10475
		"xBar[METHOD_REF]{CompletionPrefixMethodName3.this.xBar(1,, LCompletionPrefixMethodName3;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED)+"}\n"+
10475
		"xBar[METHOD_REF]{CompletionPrefixMethodName3.this.xBar(1,, LCompletionPrefixMethodName3;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED)+"}\n"+
10476
		"xBar[METHOD_REF]{, LCompletionPrefixMethodName3$classFoo;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10476
		"xBar[METHOD_REF]{, LCompletionPrefixMethodName3$classFoo;, (II)I, xBar, (a, b), "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10477
		requestor.getResults());
10477
		requestor.getResults());
10478
}
10478
}
10479
public void testCompletionQualifiedAllocationType1() throws JavaModelException {
10479
public void testCompletionQualifiedAllocationType1() throws JavaModelException {
Lines 10495-10501 Link Here
10495
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10495
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10496
10496
10497
    assertResults(
10497
    assertResults(
10498
		"CompletionQualifiedAllocationType1.YYY[TYPE_REF]{YYY, , LCompletionQualifiedAllocationType1$YYY;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10498
		"CompletionQualifiedAllocationType1.YYY[TYPE_REF]{YYY, , LCompletionQualifiedAllocationType1$YYY;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10499
		requestor.getResults());
10499
		requestor.getResults());
10500
}
10500
}
10501
/*
10501
/*
Lines 10521-10532 Link Here
10521
10521
10522
    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
10522
    if(CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
10523
    	assertResults(
10523
    	assertResults(
10524
	            "PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
10524
	            "PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
10525
				requestor.getResults());
10525
				requestor.getResults());
10526
    } else {
10526
    } else {
10527
	    assertResults(
10527
	    assertResults(
10528
	            "CompletionQualifiedExpectedType[TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
10528
	            "CompletionQualifiedExpectedType[TYPE_REF]{CompletionQualifiedExpectedType, test, Ltest.CompletionQualifiedExpectedType;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
10529
				"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
10529
				"PX[TYPE_REF]{pack2.PX, pack2, Lpack2.PX;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE+ R_NON_RESTRICTED)+ "}",
10530
				requestor.getResults());
10530
				requestor.getResults());
10531
    }
10531
    }
10532
}
10532
}
Lines 10543-10550 Link Here
10543
	cu.codeComplete(cursorLocation, requestor);
10543
	cu.codeComplete(cursorLocation, requestor);
10544
	assertEquals(
10544
	assertEquals(
10545
		"should have two types",
10545
		"should have two types",
10546
		"element:CompletionRepeatedOtherType    completion:CompletionRepeatedOtherType    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10546
		"element:CompletionRepeatedOtherType    completion:CompletionRepeatedOtherType    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10547
		"element:CompletionRepeatedType    completion:CompletionRepeatedType    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10547
		"element:CompletionRepeatedType    completion:CompletionRepeatedType    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10548
		requestor.getResults());	
10548
		requestor.getResults());	
10549
}
10549
}
10550
/*
10550
/*
Lines 10560-10566 Link Here
10560
	cu.codeComplete(cursorLocation, requestor);
10560
	cu.codeComplete(cursorLocation, requestor);
10561
10561
10562
	assertEquals(
10562
	assertEquals(
10563
		"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10563
		"element:equals    completion:equals()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10564
		requestor.getResults());
10564
		requestor.getResults());
10565
}
10565
}
10566
public void testCompletionReturnStatementIsParent1() throws JavaModelException {
10566
public void testCompletionReturnStatementIsParent1() throws JavaModelException {
Lines 10573-10598 Link Here
10573
	cu.codeComplete(cursorLocation, requestor);
10573
	cu.codeComplete(cursorLocation, requestor);
10574
10574
10575
	assertEquals(
10575
	assertEquals(
10576
		"element:zz00    completion:zz00    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10576
		"element:zz00    completion:zz00    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10577
		"element:zz00M    completion:zz00M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10577
		"element:zz00M    completion:zz00M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10578
		"element:zz01    completion:zz01    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10578
		"element:zz01    completion:zz01    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10579
		"element:zz01M    completion:zz01M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10579
		"element:zz01M    completion:zz01M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10580
		"element:zz02    completion:zz02    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10580
		"element:zz02    completion:zz02    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10581
		"element:zz02M    completion:zz02M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10581
		"element:zz02M    completion:zz02M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10582
		"element:zz10    completion:zz10    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10582
		"element:zz10    completion:zz10    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10583
		"element:zz10M    completion:zz10M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10583
		"element:zz10M    completion:zz10M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10584
		"element:zz11    completion:zz11    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10584
		"element:zz11    completion:zz11    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10585
		"element:zz11M    completion:zz11M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10585
		"element:zz11M    completion:zz11M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10586
		"element:zz12    completion:zz12    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10586
		"element:zz12    completion:zz12    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10587
		"element:zz12M    completion:zz12M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10587
		"element:zz12M    completion:zz12M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10588
		"element:zz20    completion:zz20    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10588
		"element:zz20    completion:zz20    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10589
		"element:zz20M    completion:zz20M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10589
		"element:zz20M    completion:zz20M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10590
		"element:zz21    completion:zz21    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10590
		"element:zz21    completion:zz21    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10591
		"element:zz21M    completion:zz21M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10591
		"element:zz21M    completion:zz21M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10592
		"element:zz22    completion:zz22    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10592
		"element:zz22    completion:zz22    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10593
		"element:zz22M    completion:zz22M()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10593
		"element:zz22M    completion:zz22M()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10594
		"element:zzOb    completion:zzOb    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10594
		"element:zzOb    completion:zzOb    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10595
		"element:zzObM    completion:zzObM()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10595
		"element:zzObM    completion:zzObM()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
10596
		requestor.getResults());
10596
		requestor.getResults());
10597
}
10597
}
10598
public void testCompletionReturnStatementIsParent2() throws JavaModelException {
10598
public void testCompletionReturnStatementIsParent2() throws JavaModelException {
Lines 10605-10619 Link Here
10605
	cu.codeComplete(cursorLocation, requestor);
10605
	cu.codeComplete(cursorLocation, requestor);
10606
10606
10607
	assertEquals(
10607
	assertEquals(
10608
		"element:XX00    completion:XX00    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10608
		"element:XX00    completion:XX00    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10609
		"element:XX01    completion:XX01    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10609
		"element:XX01    completion:XX01    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10610
		"element:XX02    completion:XX02    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10610
		"element:XX02    completion:XX02    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10611
		"element:XX10    completion:XX10    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10611
		"element:XX10    completion:XX10    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10612
		"element:XX11    completion:XX11    relevance:"+(R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10612
		"element:XX11    completion:XX11    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10613
		"element:XX12    completion:XX12    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10613
		"element:XX12    completion:XX12    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10614
		"element:XX20    completion:XX20    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10614
		"element:XX20    completion:XX20    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10615
		"element:XX21    completion:XX21    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10615
		"element:XX21    completion:XX21    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
10616
		"element:XX22    completion:XX22    relevance:"+(R_DEFAULT + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
10616
		"element:XX22    completion:XX22    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED+ R_NON_RESTRICTED),
10617
		requestor.getResults());
10617
		requestor.getResults());
10618
}
10618
}
10619
/*
10619
/*
Lines 10629-10635 Link Here
10629
	cu.codeComplete(cursorLocation, requestor);
10629
	cu.codeComplete(cursorLocation, requestor);
10630
10630
10631
	assertEquals(
10631
	assertEquals(
10632
			"element:CompletionSameClass    completion:CompletionSameClass    relevance:" + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
10632
			"element:CompletionSameClass    completion:CompletionSameClass    relevance:" + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
10633
			requestor.getResults());
10633
			requestor.getResults());
10634
}
10634
}
10635
public void testCompletionSameSuperClass() throws JavaModelException {
10635
public void testCompletionSameSuperClass() throws JavaModelException {
Lines 10651-10661 Link Here
10651
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10651
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10652
10652
10653
	assertResults(
10653
	assertResults(
10654
		"bar[FIELD_REF]{CompletionSameSuperClass.this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
10654
		"bar[FIELD_REF]{CompletionSameSuperClass.this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
10655
		"bar[FIELD_REF]{this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
10655
		"bar[FIELD_REF]{this.bar, LA;, I, bar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
10656
		"bar[METHOD_REF]{CompletionSameSuperClass.this.bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
10656
		"bar[METHOD_REF]{CompletionSameSuperClass.this.bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}\n"+
10657
		"bar[LOCAL_VARIABLE_REF]{bar, null, I, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
10657
		"bar[LOCAL_VARIABLE_REF]{bar, null, I, bar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
10658
		"bar[METHOD_REF]{bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10658
		"bar[METHOD_REF]{bar(), LA;, ()V, bar, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10659
		requestor.getResults());
10659
		requestor.getResults());
10660
}
10660
}
10661
public void testCompletionStaticMethod1() throws JavaModelException {
10661
public void testCompletionStaticMethod1() throws JavaModelException {
Lines 10691-10700 Link Here
10691
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10691
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10692
	
10692
	
10693
		assertResults(
10693
		assertResults(
10694
				"foo0[METHOD_REF]{CompletionStaticMethod1.this.foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
10694
				"foo0[METHOD_REF]{CompletionStaticMethod1.this.foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
10695
				"foo0[METHOD_REF]{foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
10695
				"foo0[METHOD_REF]{foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
10696
				"foo[METHOD_REF]{CompletionStaticMethod1.foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}\n" +
10696
				"foo[METHOD_REF]{CompletionStaticMethod1.foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}\n" +
10697
				"foo[METHOD_REF]{foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
10697
				"foo[METHOD_REF]{foo(), LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
10698
				requestor.getResults());
10698
				requestor.getResults());
10699
	} finally {
10699
	} finally {
10700
		if(aType != null) {
10700
		if(aType != null) {
Lines 10726-10733 Link Here
10726
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10726
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10727
	
10727
	
10728
		assertResults(
10728
		assertResults(
10729
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10729
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration1;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10730
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10730
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10731
				requestor.getResults());
10731
				requestor.getResults());
10732
	} finally {
10732
	} finally {
10733
		if(aType != null) {
10733
		if(aType != null) {
Lines 10761-10768 Link Here
10761
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10761
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10762
	
10762
	
10763
		assertResults(
10763
		assertResults(
10764
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration2$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10764
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration2$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10765
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10765
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10766
				requestor.getResults());
10766
				requestor.getResults());
10767
	} finally {
10767
	} finally {
10768
		if(aType != null) {
10768
		if(aType != null) {
Lines 10796-10803 Link Here
10796
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10796
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10797
	
10797
	
10798
		assertResults(
10798
		assertResults(
10799
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration3$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10799
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LCompletionStaticMethodDeclaration3$Inner1;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10800
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10800
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10801
				requestor.getResults());
10801
				requestor.getResults());
10802
	} finally {
10802
	} finally {
10803
		if(aType != null) {
10803
		if(aType != null) {
Lines 10833-10840 Link Here
10833
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10833
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10834
	
10834
	
10835
		assertResults(
10835
		assertResults(
10836
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10836
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10837
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10837
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10838
				requestor.getResults());
10838
				requestor.getResults());
10839
	} finally {
10839
	} finally {
10840
		if(aType != null) {
10840
		if(aType != null) {
Lines 10870-10877 Link Here
10870
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10870
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10871
	
10871
	
10872
		assertResults(
10872
		assertResults(
10873
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10873
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LLocal1;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10874
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10874
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10875
				requestor.getResults());
10875
				requestor.getResults());
10876
	} finally {
10876
	} finally {
10877
		if(aType != null) {
10877
		if(aType != null) {
Lines 10907-10914 Link Here
10907
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10907
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10908
	
10908
	
10909
		assertResults(
10909
		assertResults(
10910
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10910
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, LTypeWithAMethodAndAStaticMethod;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
10911
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10911
				"foo0[METHOD_DECLARATION]{public void foo0(), LTypeWithAMethodAndAStaticMethod;, ()V, foo0, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
10912
				requestor.getResults());
10912
				requestor.getResults());
10913
	} finally {
10913
	} finally {
10914
		if(aType != null) {
10914
		if(aType != null) {
Lines 10940-10946 Link Here
10940
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10940
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10941
	
10941
	
10942
		assertResults(
10942
		assertResults(
10943
			"CompletionSuperClass.Inner[TYPE_REF]{Inner, , LCompletionSuperClass$Inner;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS+ R_NON_RESTRICTED)+"}",
10943
			"CompletionSuperClass.Inner[TYPE_REF]{Inner, , LCompletionSuperClass$Inner;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS+ R_NON_RESTRICTED)+"}",
10944
			requestor.getResults());
10944
			requestor.getResults());
10945
	} finally {
10945
	} finally {
10946
		if(superClass != null) {
10946
		if(superClass != null) {
Lines 10995-11002 Link Here
10995
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10995
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
10996
	
10996
	
10997
		assertResults(
10997
		assertResults(
10998
			"CompletionSuperClass[TYPE_REF]{CompletionSuperClass, , LCompletionSuperClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
10998
			"CompletionSuperClass[TYPE_REF]{CompletionSuperClass, , LCompletionSuperClass;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
10999
			"CompletionSuperClass2[TYPE_REF]{CompletionSuperClass2, , LCompletionSuperClass2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10999
			"CompletionSuperClass2[TYPE_REF]{CompletionSuperClass2, , LCompletionSuperClass2;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
11000
			requestor.getResults());
11000
			requestor.getResults());
11001
	} finally {
11001
	} finally {
11002
		if(superClass != null) {
11002
		if(superClass != null) {
Lines 11060-11067 Link Here
11060
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11060
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11061
	
11061
	
11062
		assertResults(
11062
		assertResults(
11063
			"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
11063
			"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n" +
11064
			"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
11064
			"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
11065
			requestor.getResults());
11065
			requestor.getResults());
11066
	} finally {
11066
	} finally {
11067
		if(superClass != null) {
11067
		if(superClass != null) {
Lines 11100-11107 Link Here
11100
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11100
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11101
	
11101
	
11102
		assertResults(
11102
		assertResults(
11103
			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+ "}\n"+
11103
			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE+ R_NON_RESTRICTED)+ "}\n"+
11104
			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED)+"}",
11104
			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED)+"}",
11105
			requestor.getResults());
11105
			requestor.getResults());
11106
	} finally {
11106
	} finally {
11107
		if(superClass2 != null) {
11107
		if(superClass2 != null) {
Lines 11131-11138 Link Here
11131
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11131
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11132
	
11132
	
11133
		assertResults(
11133
		assertResults(
11134
			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
11134
			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
11135
			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11135
			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11136
			requestor.getResults());
11136
			requestor.getResults());
11137
	} finally {
11137
	} finally {
11138
		if(superInterface2 != null) {
11138
		if(superInterface2 != null) {
Lines 11187-11194 Link Here
11187
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11187
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11188
	
11188
	
11189
		assertResults(
11189
		assertResults(
11190
				"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE + R_NON_RESTRICTED)+"}\n" +
11190
				"CompletionSuperInterface[TYPE_REF]{CompletionSuperInterface, , LCompletionSuperInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE + R_NON_RESTRICTED)+"}\n" +
11191
				"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11191
				"CompletionSuperInterface2[TYPE_REF]{CompletionSuperInterface2, , LCompletionSuperInterface2;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11192
				requestor.getResults());
11192
				requestor.getResults());
11193
	} finally {
11193
	} finally {
11194
		if(superClass != null) {
11194
		if(superClass != null) {
Lines 11227-11234 Link Here
11227
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11227
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11228
	
11228
	
11229
		assertResults(
11229
		assertResults(
11230
			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
11230
			"CompletionSuperClass2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperClass2$InnerClass;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
11231
			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11231
			"CompletionSuperClass2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperClass2$InnerInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11232
			requestor.getResults());
11232
			requestor.getResults());
11233
	} finally {
11233
	} finally {
11234
		if(superClass2 != null) {
11234
		if(superClass2 != null) {
Lines 11258-11265 Link Here
11258
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11258
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11259
	
11259
	
11260
		assertResults(
11260
		assertResults(
11261
			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
11261
			"CompletionSuperInterface2.InnerClass[TYPE_REF]{InnerClass, , LCompletionSuperInterface2$InnerClass;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n" +
11262
			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11262
			"CompletionSuperInterface2.InnerInterface[TYPE_REF]{InnerInterface, , LCompletionSuperInterface2$InnerInterface;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED)+"}",
11263
			requestor.getResults());
11263
			requestor.getResults());
11264
	} finally {
11264
	} finally {
11265
		if(superInterface2 != null) {
11265
		if(superInterface2 != null) {
Lines 11277-11283 Link Here
11277
	cu.codeComplete(cursorLocation, requestor);
11277
	cu.codeComplete(cursorLocation, requestor);
11278
11278
11279
	assertEquals(
11279
	assertEquals(
11280
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
11280
		"element:Exception    completion:Exception    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_UNQUALIFIED+ R_NON_RESTRICTED),
11281
		requestor.getResults());
11281
		requestor.getResults());
11282
}
11282
}
11283
public void testCompletionToplevelType1() throws JavaModelException {
11283
public void testCompletionToplevelType1() throws JavaModelException {
Lines 11290-11296 Link Here
11290
		cu.codeComplete(cursorLocation, requestor);
11290
		cu.codeComplete(cursorLocation, requestor);
11291
11291
11292
		assertEquals(
11292
		assertEquals(
11293
			"element:CompletionToplevelType1    completion:CompletionToplevelType1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
11293
			"element:CompletionToplevelType1    completion:CompletionToplevelType1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
11294
			requestor.getResults());
11294
			requestor.getResults());
11295
}
11295
}
11296
public void testCompletionType1() throws JavaModelException {
11296
public void testCompletionType1() throws JavaModelException {
Lines 11303-11310 Link Here
11303
	cu.codeComplete(cursorLocation, requestor);
11303
	cu.codeComplete(cursorLocation, requestor);
11304
11304
11305
	assertEquals(
11305
	assertEquals(
11306
		"element:CT1    completion:CT1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
11306
		"element:CT1    completion:CT1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
11307
		"element:CT1    completion:q2.CT1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
11307
		"element:CT1    completion:q2.CT1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_NON_RESTRICTED),
11308
		requestor.getResults());
11308
		requestor.getResults());
11309
}
11309
}
11310
public void testCompletionUnaryOperator1() throws JavaModelException {
11310
public void testCompletionUnaryOperator1() throws JavaModelException {
Lines 11317-11325 Link Here
11317
		cu.codeComplete(cursorLocation, requestor);
11317
		cu.codeComplete(cursorLocation, requestor);
11318
11318
11319
		assertEquals(
11319
		assertEquals(
11320
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
11320
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
11321
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11321
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11322
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11322
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11323
			requestor.getResults());
11323
			requestor.getResults());
11324
}
11324
}
11325
public void testCompletionUnaryOperator2() throws JavaModelException {
11325
public void testCompletionUnaryOperator2() throws JavaModelException {
Lines 11332-11340 Link Here
11332
		cu.codeComplete(cursorLocation, requestor);
11332
		cu.codeComplete(cursorLocation, requestor);
11333
11333
11334
		assertEquals(
11334
		assertEquals(
11335
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11335
			"element:var1    completion:var1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11336
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
11336
			"element:var2    completion:var2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"\n" +
11337
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11337
			"element:var3    completion:var3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11338
			requestor.getResults());
11338
			requestor.getResults());
11339
}
11339
}
11340
/*
11340
/*
Lines 11362-11368 Link Here
11362
	cu.codeComplete(cursorLocation, requestor);
11362
	cu.codeComplete(cursorLocation, requestor);
11363
11363
11364
	assertEquals(
11364
	assertEquals(
11365
		"element:barPlus    completion:barPlus()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
11365
		"element:barPlus    completion:barPlus()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
11366
		requestor.getResults());
11366
		requestor.getResults());
11367
}
11367
}
11368
public void testCompletionUnresolvedParameterType() throws JavaModelException {
11368
public void testCompletionUnresolvedParameterType() throws JavaModelException {
Lines 11375-11381 Link Here
11375
	cu.codeComplete(cursorLocation, requestor);
11375
	cu.codeComplete(cursorLocation, requestor);
11376
11376
11377
	assertEquals(
11377
	assertEquals(
11378
		"element:barPlus    completion:barPlus()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
11378
		"element:barPlus    completion:barPlus()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
11379
		requestor.getResults());
11379
		requestor.getResults());
11380
}
11380
}
11381
public void testCompletionUnresolvedReturnType() throws JavaModelException {
11381
public void testCompletionUnresolvedReturnType() throws JavaModelException {
Lines 11388-11394 Link Here
11388
	cu.codeComplete(cursorLocation, requestor);
11388
	cu.codeComplete(cursorLocation, requestor);
11389
11389
11390
	assertEquals(
11390
	assertEquals(
11391
		"element:barPlus    completion:barPlus()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
11391
		"element:barPlus    completion:barPlus()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
11392
		requestor.getResults());
11392
		requestor.getResults());
11393
}
11393
}
11394
public void testCompletionVariableInitializerInInitializer1() throws JavaModelException {
11394
public void testCompletionVariableInitializerInInitializer1() throws JavaModelException {
Lines 11401-11411 Link Here
11401
	cu.codeComplete(cursorLocation, requestor);
11401
	cu.codeComplete(cursorLocation, requestor);
11402
11402
11403
	assertEquals(
11403
	assertEquals(
11404
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11404
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11405
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11405
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11406
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11406
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11407
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11407
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11408
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11408
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11409
		requestor.getResults());
11409
		requestor.getResults());
11410
}
11410
}
11411
public void testCompletionVariableInitializerInInitializer2() throws JavaModelException {
11411
public void testCompletionVariableInitializerInInitializer2() throws JavaModelException {
Lines 11418-11428 Link Here
11418
	cu.codeComplete(cursorLocation, requestor);
11418
	cu.codeComplete(cursorLocation, requestor);
11419
11419
11420
	assertEquals(
11420
	assertEquals(
11421
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11421
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11422
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11422
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11423
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11423
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11424
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11424
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11425
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11425
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11426
		requestor.getResults());
11426
		requestor.getResults());
11427
}
11427
}
11428
public void testCompletionVariableInitializerInInitializer3() throws JavaModelException {
11428
public void testCompletionVariableInitializerInInitializer3() throws JavaModelException {
Lines 11435-11441 Link Here
11435
	cu.codeComplete(cursorLocation, requestor);
11435
	cu.codeComplete(cursorLocation, requestor);
11436
11436
11437
	assertEquals(
11437
	assertEquals(
11438
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11438
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11439
		requestor.getResults());
11439
		requestor.getResults());
11440
}
11440
}
11441
public void testCompletionVariableInitializerInInitializer4() throws JavaModelException {
11441
public void testCompletionVariableInitializerInInitializer4() throws JavaModelException {
Lines 11448-11454 Link Here
11448
	cu.codeComplete(cursorLocation, requestor);
11448
	cu.codeComplete(cursorLocation, requestor);
11449
11449
11450
	assertEquals(
11450
	assertEquals(
11451
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11451
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11452
		requestor.getResults());
11452
		requestor.getResults());
11453
}
11453
}
11454
public void testCompletionVariableInitializerInMethod1() throws JavaModelException {
11454
public void testCompletionVariableInitializerInMethod1() throws JavaModelException {
Lines 11461-11471 Link Here
11461
	cu.codeComplete(cursorLocation, requestor);
11461
	cu.codeComplete(cursorLocation, requestor);
11462
11462
11463
	assertEquals(
11463
	assertEquals(
11464
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11464
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11465
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11465
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11466
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11466
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11467
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11467
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11468
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11468
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11469
		requestor.getResults());
11469
		requestor.getResults());
11470
}
11470
}
11471
public void testCompletionVariableInitializerInMethod2() throws JavaModelException {
11471
public void testCompletionVariableInitializerInMethod2() throws JavaModelException {
Lines 11478-11488 Link Here
11478
	cu.codeComplete(cursorLocation, requestor);
11478
	cu.codeComplete(cursorLocation, requestor);
11479
11479
11480
	assertEquals(
11480
	assertEquals(
11481
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11481
		"element:zzObject    completion:zzObject    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11482
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11482
		"element:zzboolean    completion:zzboolean    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11483
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11483
		"element:zzdouble    completion:zzdouble    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11484
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11484
		"element:zzint    completion:zzint    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
11485
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11485
		"element:zzlong    completion:zzlong    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11486
		requestor.getResults());
11486
		requestor.getResults());
11487
}
11487
}
11488
public void testCompletionVariableInitializerInMethod3() throws JavaModelException {
11488
public void testCompletionVariableInitializerInMethod3() throws JavaModelException {
Lines 11495-11501 Link Here
11495
	cu.codeComplete(cursorLocation, requestor);
11495
	cu.codeComplete(cursorLocation, requestor);
11496
11496
11497
	assertEquals(
11497
	assertEquals(
11498
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11498
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11499
		requestor.getResults());
11499
		requestor.getResults());
11500
}
11500
}
11501
public void testCompletionVariableInitializerInMethod4() throws JavaModelException {
11501
public void testCompletionVariableInitializerInMethod4() throws JavaModelException {
Lines 11508-11514 Link Here
11508
	cu.codeComplete(cursorLocation, requestor);
11508
	cu.codeComplete(cursorLocation, requestor);
11509
11509
11510
	assertEquals(
11510
	assertEquals(
11511
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11511
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED+ R_NON_RESTRICTED),
11512
		requestor.getResults());
11512
		requestor.getResults());
11513
}
11513
}
11514
/*
11514
/*
Lines 11673-11682 Link Here
11673
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11673
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11674
	
11674
	
11675
	    assertResults(
11675
	    assertResults(
11676
				"preFoBar[VARIABLE_DECLARATION]{preFoBar, null, LFooBar;, preFoBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
11676
				"preFoBar[VARIABLE_DECLARATION]{preFoBar, null, LFooBar;, preFoBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
11677
				"preFoBarsuf[VARIABLE_DECLARATION]{preFoBarsuf, null, LFooBar;, preFoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
11677
				"preFoBarsuf[VARIABLE_DECLARATION]{preFoBarsuf, null, LFooBar;, preFoBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
11678
				"preFooBar[VARIABLE_DECLARATION]{preFooBar, null, LFooBar;, preFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
11678
				"preFooBar[VARIABLE_DECLARATION]{preFooBar, null, LFooBar;, preFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
11679
				"preFooBarsuf[VARIABLE_DECLARATION]{preFooBarsuf, null, LFooBar;, preFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
11679
				"preFooBarsuf[VARIABLE_DECLARATION]{preFooBarsuf, null, LFooBar;, preFooBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
11680
				requestor.getResults());
11680
				requestor.getResults());
11681
	} finally {
11681
	} finally {
11682
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
11682
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
Lines 11712-11721 Link Here
11712
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11712
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11713
	
11713
	
11714
	    assertResults(
11714
	    assertResults(
11715
				"preThefoBar[VARIABLE_DECLARATION]{preThefoBar, null, LFooBar;, preThefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
11715
				"preThefoBar[VARIABLE_DECLARATION]{preThefoBar, null, LFooBar;, preThefoBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"}\n"+
11716
				"preThefoBarsuf[VARIABLE_DECLARATION]{preThefoBarsuf, null, LFooBar;, preThefoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
11716
				"preThefoBarsuf[VARIABLE_DECLARATION]{preThefoBarsuf, null, LFooBar;, preThefoBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
11717
				"preTheFooBar[VARIABLE_DECLARATION]{preTheFooBar, null, LFooBar;, preTheFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
11717
				"preTheFooBar[VARIABLE_DECLARATION]{preTheFooBar, null, LFooBar;, preTheFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
11718
				"preTheFooBarsuf[VARIABLE_DECLARATION]{preTheFooBarsuf, null, LFooBar;, preTheFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
11718
				"preTheFooBarsuf[VARIABLE_DECLARATION]{preTheFooBarsuf, null, LFooBar;, preTheFooBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
11719
				requestor.getResults());
11719
				requestor.getResults());
11720
	} finally {
11720
	} finally {
11721
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
11721
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
Lines 11752-11761 Link Here
11752
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11752
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
11753
	
11753
	
11754
	    assertResults(
11754
	    assertResults(
11755
				"proBar[VARIABLE_DECLARATION]{proBar, null, LFooBar;, proBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11755
				"proBar[VARIABLE_DECLARATION]{proBar, null, LFooBar;, proBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11756
				"proFooBar[VARIABLE_DECLARATION]{proFooBar, null, LFooBar;, proFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11756
				"proFooBar[VARIABLE_DECLARATION]{proFooBar, null, LFooBar;, proFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11757
				"proBarsuf[VARIABLE_DECLARATION]{proBarsuf, null, LFooBar;, proBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}\n"+
11757
				"proBarsuf[VARIABLE_DECLARATION]{proBarsuf, null, LFooBar;, proBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}\n"+
11758
				"proFooBarsuf[VARIABLE_DECLARATION]{proFooBarsuf, null, LFooBar;, proFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
11758
				"proFooBarsuf[VARIABLE_DECLARATION]{proFooBarsuf, null, LFooBar;, proFooBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
11759
				requestor.getResults());
11759
				requestor.getResults());
11760
	} finally {
11760
	} finally {
11761
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
11761
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
Lines 11783-11790 Link Here
11783
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11783
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11784
11784
11785
    assertResults(
11785
    assertResults(
11786
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11786
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11787
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11787
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11788
			requestor.getResults());
11788
			requestor.getResults());
11789
}
11789
}
11790
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11790
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11811-11818 Link Here
11811
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11811
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11812
11812
11813
    assertResults(
11813
    assertResults(
11814
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11814
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11815
			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11815
			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11816
			requestor.getResults());
11816
			requestor.getResults());
11817
}
11817
}
11818
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11818
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11835-11842 Link Here
11835
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11835
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11836
11836
11837
    assertResults(
11837
    assertResults(
11838
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11838
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11839
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11839
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11840
			requestor.getResults());
11840
			requestor.getResults());
11841
}
11841
}
11842
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11842
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11859-11865 Link Here
11859
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11859
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11860
11860
11861
    assertResults(
11861
    assertResults(
11862
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11862
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11863
			requestor.getResults());
11863
			requestor.getResults());
11864
}
11864
}
11865
/*
11865
/*
Lines 11875-11884 Link Here
11875
	cu.codeComplete(cursorLocation, requestor);
11875
	cu.codeComplete(cursorLocation, requestor);
11876
11876
11877
	assertEquals(
11877
	assertEquals(
11878
		"element:bar_MyClass    completion:bar_MyClass    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
11878
		"element:bar_MyClass    completion:bar_MyClass    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
11879
		"element:class1    completion:class1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
11879
		"element:class1    completion:class1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
11880
		"element:myClass    completion:myClass    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
11880
		"element:myClass    completion:myClass    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n" +
11881
		"element:test_Bar_MyClass    completion:test_Bar_MyClass    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
11881
		"element:test_Bar_MyClass    completion:test_Bar_MyClass    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE+ R_NON_RESTRICTED),
11882
		requestor.getResults());
11882
		requestor.getResults());
11883
}
11883
}
11884
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11884
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11909-11918 Link Here
11909
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11909
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11910
11910
11911
    assertResults(
11911
    assertResults(
11912
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11912
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11913
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
11913
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
11914
    		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
11914
    		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
11915
			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11915
			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11916
			requestor.getResults());
11916
			requestor.getResults());
11917
}
11917
}
11918
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11918
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11938-11945 Link Here
11938
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11938
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11939
11939
11940
    assertResults(
11940
    assertResults(
11941
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11941
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11942
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11942
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11943
			requestor.getResults());
11943
			requestor.getResults());
11944
}
11944
}
11945
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11945
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11968-11975 Link Here
11968
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11968
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11969
11969
11970
    assertResults(
11970
    assertResults(
11971
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11971
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11972
			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11972
			"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11973
			requestor.getResults());
11973
			requestor.getResults());
11974
}
11974
}
11975
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
11975
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 11993-12000 Link Here
11993
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11993
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
11994
11994
11995
    assertResults(
11995
    assertResults(
11996
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11996
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
11997
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11997
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
11998
			requestor.getResults());
11998
			requestor.getResults());
11999
}
11999
}
12000
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12000
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12018-12025 Link Here
12018
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12018
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12019
12019
12020
    assertResults(
12020
    assertResults(
12021
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12021
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12022
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12022
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12023
			requestor.getResults());
12023
			requestor.getResults());
12024
}
12024
}
12025
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12025
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12045-12053 Link Here
12045
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12045
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12046
12046
12047
    assertResults(
12047
    assertResults(
12048
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12048
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12049
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12049
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12050
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12050
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12051
			requestor.getResults());
12051
			requestor.getResults());
12052
}
12052
}
12053
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12053
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12074-12082 Link Here
12074
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12074
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12075
12075
12076
    assertResults(
12076
    assertResults(
12077
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12077
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12078
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12078
			"foo1[VARIABLE_DECLARATION]{foo1, null, Ljava.lang.Object;, foo1, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12079
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12079
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12080
			requestor.getResults());
12080
			requestor.getResults());
12081
}
12081
}
12082
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12082
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12110-12119 Link Here
12110
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12110
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12111
12111
12112
    assertResults(
12112
    assertResults(
12113
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12113
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12114
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12114
    		"foo2[VARIABLE_DECLARATION]{foo2, null, Ljava.lang.Object;, foo2, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12115
    		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12115
    		"foo4[VARIABLE_DECLARATION]{foo4, null, Ljava.lang.Object;, foo4, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12116
			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12116
			"foo5[VARIABLE_DECLARATION]{foo5, null, Ljava.lang.Object;, foo5, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12117
			requestor.getResults());
12117
			requestor.getResults());
12118
}
12118
}
12119
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12119
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12138-12145 Link Here
12138
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12138
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12139
12139
12140
    assertResults(
12140
    assertResults(
12141
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12141
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12142
    		"foo3[VARIABLE_DECLARATION]{foo3, null, Ljava.lang.Object;, foo3, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12142
    		"foo3[VARIABLE_DECLARATION]{foo3, null, Ljava.lang.Object;, foo3, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12143
			requestor.getResults());
12143
			requestor.getResults());
12144
}
12144
}
12145
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12145
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12178-12186 Link Here
12178
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12178
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12179
12179
12180
    assertResults(
12180
    assertResults(
12181
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12181
    		"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12182
    		"var1[VARIABLE_DECLARATION]{var1, null, Ljava.lang.Object;, var1, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12182
    		"var1[VARIABLE_DECLARATION]{var1, null, Ljava.lang.Object;, var1, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}\n"+
12183
			"var4[VARIABLE_DECLARATION]{var4, null, Ljava.lang.Object;, var4, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12183
			"var4[VARIABLE_DECLARATION]{var4, null, Ljava.lang.Object;, var4, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12184
			requestor.getResults());
12184
			requestor.getResults());
12185
}
12185
}
12186
public void testCompletionVariableName3() throws JavaModelException {
12186
public void testCompletionVariableName3() throws JavaModelException {
Lines 12202-12225 Link Here
12202
		cu.codeComplete(cursorLocation, requestor);
12202
		cu.codeComplete(cursorLocation, requestor);
12203
	
12203
	
12204
		assertEquals(
12204
		assertEquals(
12205
			"element:name    completion:name    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
12205
			"element:name    completion:name    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
12206
			"element:names1    completion:names1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12206
			"element:names1    completion:names1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12207
			"element:names2    completion:names2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12207
			"element:names2    completion:names2    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12208
			"element:oneName    completion:oneName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
12208
			"element:oneName    completion:oneName    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"\n"+
12209
			"element:oneNames1    completion:oneNames1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12209
			"element:oneNames1    completion:oneNames1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12210
			"element:oneNames2    completion:oneNames2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12210
			"element:oneNames2    completion:oneNames2    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12211
			"element:p1Name    completion:p1Name    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
12211
			"element:p1Name    completion:p1Name    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
12212
			"element:p1Names1    completion:p1Names1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12212
			"element:p1Names1    completion:p1Names1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12213
			"element:p1Names2    completion:p1Names2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12213
			"element:p1Names2    completion:p1Names2    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12214
			"element:p1OneName    completion:p1OneName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
12214
			"element:p1OneName    completion:p1OneName    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NON_RESTRICTED)+"\n"+
12215
			"element:p1OneNames1    completion:p1OneNames1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12215
			"element:p1OneNames1    completion:p1OneNames1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12216
			"element:p1OneNames2    completion:p1OneNames2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12216
			"element:p1OneNames2    completion:p1OneNames2    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12217
			"element:p2Name    completion:p2Name    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
12217
			"element:p2Name    completion:p2Name    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
12218
			"element:p2Names1    completion:p2Names1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12218
			"element:p2Names1    completion:p2Names1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12219
			"element:p2Names2    completion:p2Names2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12219
			"element:p2Names2    completion:p2Names2    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX + R_NON_RESTRICTED)+"\n"+
12220
			"element:p2OneName    completion:p2OneName    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
12220
			"element:p2OneName    completion:p2OneName    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NON_RESTRICTED)+"\n"+
12221
			"element:p2OneNames1    completion:p2OneNames1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12221
			"element:p2OneNames1    completion:p2OneNames1    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"\n"+
12222
			"element:p2OneNames2    completion:p2OneNames2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX+ R_NON_RESTRICTED),
12222
			"element:p2OneNames2    completion:p2OneNames2    relevance:"+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_PREFIX + R_NAME_SUFFIX+ R_NON_RESTRICTED),
12223
			requestor.getResults());
12223
			requestor.getResults());
12224
	} finally {
12224
	} finally {
12225
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
12225
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
Lines 12247-12254 Link Here
12247
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12247
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12248
12248
12249
    assertResults(
12249
    assertResults(
12250
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12250
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12251
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12251
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12252
			requestor.getResults());
12252
			requestor.getResults());
12253
}
12253
}
12254
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12254
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12271-12278 Link Here
12271
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12271
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12272
12272
12273
    assertResults(
12273
    assertResults(
12274
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12274
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12275
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12275
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12276
			requestor.getResults());
12276
			requestor.getResults());
12277
}
12277
}
12278
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
12278
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=150228
Lines 12294-12301 Link Here
12294
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12294
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12295
12295
12296
    assertResults(
12296
    assertResults(
12297
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12297
			"object[VARIABLE_DECLARATION]{object, null, Ljava.lang.Object;, object, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12298
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12298
			"foo[VARIABLE_DECLARATION]{foo, null, Ljava.lang.Object;, foo, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12299
			requestor.getResults());
12299
			requestor.getResults());
12300
}
12300
}
12301
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162743
12301
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162743
Lines 12320-12327 Link Here
12320
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12320
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12321
12321
12322
    assertResults(
12322
    assertResults(
12323
			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12323
			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12324
			"variable[VARIABLE_DECLARATION]{variable, null, I, variable, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12324
			"variable[VARIABLE_DECLARATION]{variable, null, I, variable, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12325
			requestor.getResults());
12325
			requestor.getResults());
12326
}
12326
}
12327
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162968
12327
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162968
Lines 12346-12353 Link Here
12346
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12346
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12347
12347
12348
    assertResults(
12348
    assertResults(
12349
			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12349
			"vI[VARIABLE_DECLARATION]{vI, null, I, vI, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12350
			"vUnknown[VARIABLE_DECLARATION]{vUnknown, null, I, vUnknown, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12350
			"vUnknown[VARIABLE_DECLARATION]{vUnknown, null, I, vUnknown, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_NAME_FIRST_PREFIX + R_NAME_LESS_NEW_CHARACTERS + R_CASE + R_NON_RESTRICTED)+"}",
12351
			requestor.getResults());
12351
			requestor.getResults());
12352
}
12352
}
12353
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=166570
12353
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=166570
Lines 12376-12382 Link Here
12376
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12376
    this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12377
12377
12378
    assertResults(
12378
    assertResults(
12379
			"zzzTest2[VARIABLE_DECLARATION]{zzzTest2, null, Ltest.Test2;, zzzTest2, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
12379
			"zzzTest2[VARIABLE_DECLARATION]{zzzTest2, null, Ltest.Test2;, zzzTest2, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
12380
			requestor.getResults());
12380
			requestor.getResults());
12381
}
12381
}
12382
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=175834
12382
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=175834
Lines 12426-12433 Link Here
12426
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12426
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12427
12427
12428
    assertResults(
12428
    assertResults(
12429
    		"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12429
    		"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12430
			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
12430
			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
12431
			requestor.getResults());
12431
			requestor.getResults());
12432
}
12432
}
12433
public void testCompletionVariableName5() throws JavaModelException {
12433
public void testCompletionVariableName5() throws JavaModelException {
Lines 12449-12456 Link Here
12449
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12449
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12450
12450
12451
    assertResults(
12451
    assertResults(
12452
    		"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12452
    		"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12453
			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
12453
			"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
12454
			requestor.getResults());
12454
			requestor.getResults());
12455
}
12455
}
12456
public void testCompletionVariableName6() throws JavaModelException {
12456
public void testCompletionVariableName6() throws JavaModelException {
Lines 12472-12479 Link Here
12472
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12472
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12473
12473
12474
    assertResults(
12474
    assertResults(
12475
    		"thebaFooBar[VARIABLE_DECLARATION]{thebaFooBar, null, LFooBar;, thebaFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12475
    		"thebaFooBar[VARIABLE_DECLARATION]{thebaFooBar, null, LFooBar;, thebaFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12476
			"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
12476
			"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
12477
			requestor.getResults());
12477
			requestor.getResults());
12478
}
12478
}
12479
public void testCompletionVariableName7() throws JavaModelException {
12479
public void testCompletionVariableName7() throws JavaModelException {
Lines 12495-12502 Link Here
12495
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12495
    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12496
12496
12497
    assertResults(
12497
    assertResults(
12498
			"foBar[VARIABLE_DECLARATION]{foBar, null, LFooBar;, foBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12498
			"foBar[VARIABLE_DECLARATION]{foBar, null, LFooBar;, foBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12499
			"fooBar[VARIABLE_DECLARATION]{fooBar, null, LFooBar;, fooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
12499
			"fooBar[VARIABLE_DECLARATION]{fooBar, null, LFooBar;, fooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}",
12500
			requestor.getResults());
12500
			requestor.getResults());
12501
}
12501
}
12502
12502
Lines 12528-12537 Link Here
12528
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12528
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12529
	
12529
	
12530
	    assertResults(
12530
	    assertResults(
12531
				"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12531
				"theBar[VARIABLE_DECLARATION]{theBar, null, LFooBar;, theBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12532
				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12532
				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12533
				"theBarsuf[VARIABLE_DECLARATION]{theBarsuf, null, LFooBar;, theBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
12533
				"theBarsuf[VARIABLE_DECLARATION]{theBarsuf, null, LFooBar;, theBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
12534
				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
12534
				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_FIRST_SUFFIX + R_CASE + R_NON_RESTRICTED)+"}",
12535
				requestor.getResults());
12535
				requestor.getResults());
12536
	} finally {
12536
	} finally {
12537
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
12537
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
Lines 12567-12576 Link Here
12567
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12567
	    this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
12568
	
12568
	
12569
	    assertResults(
12569
	    assertResults(
12570
				"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12570
				"thefoBar[VARIABLE_DECLARATION]{thefoBar, null, LFooBar;, thefoBar, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}\n"+
12571
				"thefoBarsuf[VARIABLE_DECLARATION]{thefoBarsuf, null, LFooBar;, thefoBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
12571
				"thefoBarsuf[VARIABLE_DECLARATION]{thefoBarsuf, null, LFooBar;, thefoBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_CASE + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}\n"+
12572
				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
12572
				"theFooBar[VARIABLE_DECLARATION]{theFooBar, null, LFooBar;, theFooBar, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED)+"}\n"+
12573
				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
12573
				"theFooBarsuf[VARIABLE_DECLARATION]{theFooBarsuf, null, LFooBar;, theFooBarsuf, null, "+(R_DEFAULT  + R_INTERESTING + R_NAME_LESS_NEW_CHARACTERS + R_NAME_FIRST_SUFFIX + R_NON_RESTRICTED)+"}",
12574
				requestor.getResults());
12574
				requestor.getResults());
12575
	} finally {
12575
	} finally {
12576
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
12576
		options.put(JavaCore.CODEASSIST_LOCAL_PREFIXES,argumentPrefixPreviousValue);
Lines 12593-12599 Link Here
12593
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12593
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12594
	
12594
	
12595
	assertResults(
12595
	assertResults(
12596
		"objects[VARIABLE_DECLARATION]{objects, null, [Ljava.lang.Object;, objects, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
12596
		"objects[VARIABLE_DECLARATION]{objects, null, [Ljava.lang.Object;, objects, null, " + (R_DEFAULT  + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
12597
		requestor.getResults());
12597
		requestor.getResults());
12598
}
12598
}
12599
public void testCompletionVariableNameOfArray2() throws JavaModelException {
12599
public void testCompletionVariableNameOfArray2() throws JavaModelException {
Lines 12611-12617 Link Here
12611
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12611
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12612
	
12612
	
12613
	assertResults(
12613
	assertResults(
12614
		"classes[VARIABLE_DECLARATION]{classes, null, [Ljava.lang.Class;, classes, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
12614
		"classes[VARIABLE_DECLARATION]{classes, null, [Ljava.lang.Class;, classes, null, " + (R_DEFAULT  + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
12615
		requestor.getResults());
12615
		requestor.getResults());
12616
}
12616
}
12617
public void testCompletionVariableNameOfArray3() throws JavaModelException {
12617
public void testCompletionVariableNameOfArray3() throws JavaModelException {
Lines 12629-12635 Link Here
12629
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12629
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12630
	
12630
	
12631
	assertResults(
12631
	assertResults(
12632
		"objects[VARIABLE_DECLARATION]{objects, null, [[Ljava.lang.Object;, objects, null, " + (R_DEFAULT + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
12632
		"objects[VARIABLE_DECLARATION]{objects, null, [[Ljava.lang.Object;, objects, null, " + (R_DEFAULT  + R_INTERESTING + R_CASE+ R_NAME_LESS_NEW_CHARACTERS + R_NON_RESTRICTED) + "}",
12633
		requestor.getResults());
12633
		requestor.getResults());
12634
}
12634
}
12635
public void testCompletionVariableNameOfArray4() throws JavaModelException {
12635
public void testCompletionVariableNameOfArray4() throws JavaModelException {
Lines 12683-12691 Link Here
12683
	JavaCore.setOptions(options);
12683
	JavaCore.setOptions(options);
12684
	assertEquals(
12684
	assertEquals(
12685
		"should have three methods", 
12685
		"should have three methods", 
12686
		"element:privateFoo    completion:privateFoo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
12686
		"element:privateFoo    completion:privateFoo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
12687
		"element:protectedFoo    completion:protectedFoo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
12687
		"element:protectedFoo    completion:protectedFoo()    relevance:"+(R_DEFAULT+ R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
12688
		"element:publicFoo    completion:publicFoo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
12688
		"element:publicFoo    completion:publicFoo()    relevance:"+(R_DEFAULT+ R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
12689
		requestor.getResults());
12689
		requestor.getResults());
12690
}
12690
}
12691
public void testCompletionVisibilityCheckEnabled() throws JavaModelException {
12691
public void testCompletionVisibilityCheckEnabled() throws JavaModelException {
Lines 12707-12714 Link Here
12707
	JavaCore.setOptions(options);
12707
	JavaCore.setOptions(options);
12708
	assertEquals(
12708
	assertEquals(
12709
		"should have two methods", 
12709
		"should have two methods", 
12710
		"element:protectedFoo    completion:protectedFoo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
12710
		"element:protectedFoo    completion:protectedFoo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"\n" +
12711
		"element:publicFoo    completion:publicFoo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
12711
		"element:publicFoo    completion:publicFoo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED),
12712
		requestor.getResults());
12712
		requestor.getResults());
12713
}
12713
}
12714
/*
12714
/*
Lines 12724-12732 Link Here
12724
	cu.codeComplete(cursorLocation, requestor);
12724
	cu.codeComplete(cursorLocation, requestor);
12725
12725
12726
	assertEquals(
12726
	assertEquals(
12727
		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
12727
		"element:foo    completion:foo()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
12728
		"element:foo1    completion:foo1()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
12728
		"element:foo1    completion:foo1()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
12729
		"element:foo3    completion:foo3()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
12729
		"element:foo3    completion:foo3()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED),
12730
		requestor.getResults());
12730
		requestor.getResults());
12731
}
12731
}
12732
public void testCompletionWithBinaryFolder() throws JavaModelException {
12732
public void testCompletionWithBinaryFolder() throws JavaModelException {
Lines 12740-12747 Link Here
12740
12740
12741
	assertEquals(
12741
	assertEquals(
12742
		"should have two completions",
12742
		"should have two completions",
12743
		"element:MyClass    completion:MyClass    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
12743
		"element:MyClass    completion:MyClass    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n" +
12744
		"element:mypackage    completion:mypackage    relevance:"+(R_DEFAULT + R_INTERESTING+ R_NON_RESTRICTED),
12744
		"element:mypackage    completion:mypackage    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING+ R_NON_RESTRICTED),
12745
		requestor.getResults());
12745
		requestor.getResults());
12746
}
12746
}
12747
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95167
12747
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95167
Lines 12825-12833 Link Here
12825
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12825
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12826
	
12826
	
12827
		assertResults(
12827
		assertResults(
12828
				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
12828
				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
12829
				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12829
				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12830
				"ZZZType2[TYPE_REF]{ZZZType2, deprecation, Ldeprecation.ZZZType2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12830
				"ZZZType2[TYPE_REF]{ZZZType2, deprecation, Ldeprecation.ZZZType2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12831
				requestor.getResults());
12831
				requestor.getResults());
12832
	} finally {
12832
	} finally {
12833
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
12833
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 12864-12871 Link Here
12864
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12864
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12865
	
12865
	
12866
		assertResults(
12866
		assertResults(
12867
				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12867
				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12868
				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12868
				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12869
				requestor.getResults());
12869
				requestor.getResults());
12870
	} finally {
12870
	} finally {
12871
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
12871
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 12902-12909 Link Here
12902
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12902
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12903
	
12903
	
12904
		assertResults(
12904
		assertResults(
12905
				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12905
				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12906
				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12906
				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12907
				requestor.getResults());
12907
				requestor.getResults());
12908
	} finally {
12908
	} finally {
12909
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
12909
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 12940-12947 Link Here
12940
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12940
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12941
	
12941
	
12942
		assertResults(
12942
		assertResults(
12943
				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12943
				"bar1[FIELD_REF]{bar1, Ldeprecation.Test;, I, bar1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12944
				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12944
				"bar2[FIELD_REF]{bar2, Ldeprecation.Test;, I, bar2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12945
				requestor.getResults());
12945
				requestor.getResults());
12946
	} finally {
12946
	} finally {
12947
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
12947
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 12978-12985 Link Here
12978
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12978
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
12979
	
12979
	
12980
		assertResults(
12980
		assertResults(
12981
				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12981
				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
12982
				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12982
				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
12983
				requestor.getResults());
12983
				requestor.getResults());
12984
	} finally {
12984
	} finally {
12985
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
12985
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13016-13023 Link Here
13016
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13016
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13017
	
13017
	
13018
		assertResults(
13018
		assertResults(
13019
				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
13019
				"Test.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.Test$Inner1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
13020
				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13020
				"Test.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.Test$Inner2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13021
				requestor.getResults());
13021
				requestor.getResults());
13022
	} finally {
13022
	} finally {
13023
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13023
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13097-13103 Link Here
13097
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13097
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13098
	
13098
	
13099
		assertResults(
13099
		assertResults(
13100
				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13100
				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13101
				requestor.getResults());
13101
				requestor.getResults());
13102
	} finally {
13102
	} finally {
13103
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13103
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13129-13138 Link Here
13129
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13129
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13130
	
13130
	
13131
		assertResults(
13131
		assertResults(
13132
				"Bug127628Ty[POTENTIAL_METHOD_DECLARATION]{Bug127628Ty, Ldeprecation.Test;, ()V, Bug127628Ty, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
13132
				"Bug127628Ty[POTENTIAL_METHOD_DECLARATION]{Bug127628Ty, Ldeprecation.Test;, ()V, Bug127628Ty, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
13133
				"Bug127628Type1.Bug127628TypeInner1[TYPE_REF]{deprecation.Bug127628Type1.Bug127628TypeInner1, deprecation, Ldeprecation.Bug127628Type1$Bug127628TypeInner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
13133
				"Bug127628Type1.Bug127628TypeInner1[TYPE_REF]{deprecation.Bug127628Type1.Bug127628TypeInner1, deprecation, Ldeprecation.Bug127628Type1$Bug127628TypeInner1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
13134
				"Bug127628Type2.Bug127628TypeInner2[TYPE_REF]{deprecation.Bug127628Type2.Bug127628TypeInner2, deprecation, Ldeprecation.Bug127628Type2$Bug127628TypeInner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
13134
				"Bug127628Type2.Bug127628TypeInner2[TYPE_REF]{deprecation.Bug127628Type2.Bug127628TypeInner2, deprecation, Ldeprecation.Bug127628Type2$Bug127628TypeInner2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
13135
				"Bug127628Type1[TYPE_REF]{Bug127628Type1, deprecation, Ldeprecation.Bug127628Type1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13135
				"Bug127628Type1[TYPE_REF]{Bug127628Type1, deprecation, Ldeprecation.Bug127628Type1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13136
				requestor.getResults());
13136
				requestor.getResults());
13137
	} finally {
13137
	} finally {
13138
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13138
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13176-13183 Link Here
13176
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13176
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13177
	
13177
	
13178
		assertResults(
13178
		assertResults(
13179
				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
13179
				"ZZZTy[POTENTIAL_METHOD_DECLARATION]{ZZZTy, Ldeprecation.Test;, ()V, ZZZTy, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
13180
				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13180
				"ZZZType1[TYPE_REF]{ZZZType1, deprecation, Ldeprecation.ZZZType1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13181
				requestor.getResults());
13181
				requestor.getResults());
13182
	} finally {
13182
	} finally {
13183
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13183
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13220-13227 Link Here
13220
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13220
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13221
	
13221
	
13222
		assertResults(
13222
		assertResults(
13223
				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
13223
				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
13224
				"foo2[METHOD_REF]{foo2(), Ldeprecation.ZZZType1;, ()V, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13224
				"foo2[METHOD_REF]{foo2(), Ldeprecation.ZZZType1;, ()V, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13225
				requestor.getResults());
13225
				requestor.getResults());
13226
	} finally {
13226
	} finally {
13227
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13227
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13264-13270 Link Here
13264
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13264
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13265
	
13265
	
13266
		assertResults(
13266
		assertResults(
13267
				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13267
				"foo1[METHOD_REF]{foo1(), Ldeprecation.ZZZType1;, ()V, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13268
				requestor.getResults());
13268
				requestor.getResults());
13269
	} finally {
13269
	} finally {
13270
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13270
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13305-13312 Link Here
13305
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13305
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13306
	
13306
	
13307
		assertResults(
13307
		assertResults(
13308
				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
13308
				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
13309
				"ZZZType1.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.ZZZType1$Inner2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
13309
				"ZZZType1.Inner2[TYPE_REF]{Inner2, deprecation, Ldeprecation.ZZZType1$Inner2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
13310
				requestor.getResults());
13310
				requestor.getResults());
13311
	} finally {
13311
	} finally {
13312
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13312
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13347-13353 Link Here
13347
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13347
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13348
	
13348
	
13349
		assertResults(
13349
		assertResults(
13350
				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
13350
				"ZZZType1.Inner1[TYPE_REF]{Inner1, deprecation, Ldeprecation.ZZZType1$Inner1;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
13351
				requestor.getResults());
13351
				requestor.getResults());
13352
	} finally {
13352
	} finally {
13353
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13353
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13390-13397 Link Here
13390
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13390
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13391
	
13391
	
13392
		assertResults(
13392
		assertResults(
13393
				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
13393
				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
13394
				"foo2[FIELD_REF]{foo2, Ldeprecation.ZZZType1;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13394
				"foo2[FIELD_REF]{foo2, Ldeprecation.ZZZType1;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13395
				requestor.getResults());
13395
				requestor.getResults());
13396
	} finally {
13396
	} finally {
13397
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13397
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13434-13440 Link Here
13434
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13434
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13435
	
13435
	
13436
		assertResults(
13436
		assertResults(
13437
				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13437
				"foo1[FIELD_REF]{foo1, Ldeprecation.ZZZType1;, I, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
13438
				requestor.getResults());
13438
				requestor.getResults());
13439
	} finally {
13439
	} finally {
13440
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13440
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13471-13478 Link Here
13471
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13471
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13472
	
13472
	
13473
		assertResults(
13473
		assertResults(
13474
				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
13474
				"bar1[METHOD_REF]{bar1(), Ldeprecation.Test;, ()V, bar1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
13475
				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13475
				"bar2[METHOD_REF]{bar2(), Ldeprecation.Test;, ()V, bar2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
13476
				requestor.getResults());
13476
				requestor.getResults());
13477
	} finally {
13477
	} finally {
13478
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
13478
		options.put(JavaCore.CODEASSIST_DEPRECATION_CHECK, optionValue);
Lines 13508-13514 Link Here
13508
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13508
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13509
13509
13510
	assertResults(
13510
	assertResults(
13511
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13511
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13512
			requestor.getResults());
13512
			requestor.getResults());
13513
}
13513
}
13514
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
13514
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
Lines 13544-13550 Link Here
13544
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13544
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13545
13545
13546
	assertResults(
13546
	assertResults(
13547
			"bar[METHOD_REF]{bar(), Ltest.TestException;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13547
			"bar[METHOD_REF]{bar(), Ltest.TestException;, ()V, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13548
			requestor.getResults());
13548
			requestor.getResults());
13549
}
13549
}
13550
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
13550
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
Lines 13577-13583 Link Here
13577
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13577
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13578
13578
13579
	assertResults(
13579
	assertResults(
13580
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13580
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13581
			requestor.getResults());
13581
			requestor.getResults());
13582
}
13582
}
13583
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
13583
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
Lines 13611-13617 Link Here
13611
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13611
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13612
13612
13613
	assertResults(
13613
	assertResults(
13614
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13614
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13615
			requestor.getResults());
13615
			requestor.getResults());
13616
}
13616
}
13617
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
13617
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=144858
Lines 13645-13651 Link Here
13645
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13645
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13646
13646
13647
	assertResults(
13647
	assertResults(
13648
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13648
			"bar[METHOD_REF]{bar(), Ltest.TestString;, ()V, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13649
			requestor.getResults());
13649
			requestor.getResults());
13650
}
13650
}
13651
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
13651
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
Lines 13680-13686 Link Here
13680
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13680
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13681
13681
13682
	assertResults(
13682
	assertResults(
13683
			"bar[METHOD_REF]{bar(), LLocal;, ()V, bar, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13683
			"bar[METHOD_REF]{bar(), LLocal;, ()V, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13684
			requestor.getResults());
13684
			requestor.getResults());
13685
}
13685
}
13686
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
13686
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=165662
Lines 13719-13725 Link Here
13719
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13719
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13720
13720
13721
	assertResults(
13721
	assertResults(
13722
			"foo[METHOD_REF]{foo(), LLocal;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13722
			"foo[METHOD_REF]{foo(), LLocal;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
13723
			requestor.getResults());
13723
			requestor.getResults());
13724
}
13724
}
13725
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=139937
13725
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=139937
Lines 13804-13810 Link Here
13804
            requestor.getContext());
13804
            requestor.getContext());
13805
    
13805
    
13806
	assertResults(
13806
	assertResults(
13807
			"TestEvaluationContextCompletion3[TYPE_REF]{test.TestEvaluationContextCompletion3, test, Ltest.TestEvaluationContextCompletion3;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}",
13807
			"TestEvaluationContextCompletion3[TYPE_REF]{test.TestEvaluationContextCompletion3, test, Ltest.TestEvaluationContextCompletion3;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED)+"}",
13808
			requestor.getResults());
13808
			requestor.getResults());
13809
}
13809
}
13810
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
13810
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=140123
Lines 13871-13877 Link Here
13871
            requestor.getContext());
13871
            requestor.getContext());
13872
    
13872
    
13873
	assertResults(
13873
	assertResults(
13874
			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"}",
13874
			"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED)+"}",
13875
			requestor.getResults());
13875
			requestor.getResults());
13876
}
13876
}
13877
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
13877
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 13902-13908 Link Here
13902
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
13902
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
13903
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13903
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13904
	
13904
	
13905
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
13905
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
13906
	int start1 = str.lastIndexOf("foo") + "".length();
13906
	int start1 = str.lastIndexOf("foo") + "".length();
13907
	int end1 = start1 + "foo".length();
13907
	int end1 = start1 + "foo".length();
13908
	int start2 = str.lastIndexOf("public class");
13908
	int start2 = str.lastIndexOf("public class");
Lines 13940-13946 Link Here
13940
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
13940
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
13941
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13941
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
13942
13942
13943
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
13943
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
13944
	int start1 = str.lastIndexOf("foo") + "".length();
13944
	int start1 = str.lastIndexOf("foo") + "".length();
13945
	int end1 = start1 + "foo".length();
13945
	int end1 = start1 + "foo".length();
13946
	int start2 = str.lastIndexOf("public class");
13946
	int start2 = str.lastIndexOf("public class");
Lines 14042-14048 Link Here
14042
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14042
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14043
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14043
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14044
14044
14045
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14045
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14046
	int start1 = str.lastIndexOf("foo") + "".length();
14046
	int start1 = str.lastIndexOf("foo") + "".length();
14047
	int end1 = start1 + "foo".length();
14047
	int end1 = start1 + "foo".length();
14048
	int start2 = str.lastIndexOf("public class");
14048
	int start2 = str.lastIndexOf("public class");
Lines 14080-14086 Link Here
14080
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14080
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14081
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14081
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14082
14082
14083
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14083
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14084
	int start1 = str.lastIndexOf("foo") + "".length();
14084
	int start1 = str.lastIndexOf("foo") + "".length();
14085
	int end1 = start1 + "foo".length();
14085
	int end1 = start1 + "foo".length();
14086
	int start2 = str.lastIndexOf("public class");
14086
	int start2 = str.lastIndexOf("public class");
Lines 14119-14125 Link Here
14119
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14119
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14120
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14120
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14121
14121
14122
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14122
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14123
	int start1 = str.lastIndexOf("foo") + "".length();
14123
	int start1 = str.lastIndexOf("foo") + "".length();
14124
	int end1 = start1 + "foo".length();
14124
	int end1 = start1 + "foo".length();
14125
	int start2 = str.lastIndexOf("public class");
14125
	int start2 = str.lastIndexOf("public class");
Lines 14158-14164 Link Here
14158
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14158
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14159
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14159
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14160
14160
14161
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14161
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14162
	int start1 = str.lastIndexOf("foo") + "".length();
14162
	int start1 = str.lastIndexOf("foo") + "".length();
14163
	int end1 = start1 + "foo".length();
14163
	int end1 = start1 + "foo".length();
14164
	int start2 = str.lastIndexOf("public class");
14164
	int start2 = str.lastIndexOf("public class");
Lines 14197-14203 Link Here
14197
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14197
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14198
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14198
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14199
14199
14200
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14200
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14201
	int start1 = str.lastIndexOf("foo") + "".length();
14201
	int start1 = str.lastIndexOf("foo") + "".length();
14202
	int end1 = start1 + "foo".length();
14202
	int end1 = start1 + "foo".length();
14203
	int start2 = str.lastIndexOf("public class");
14203
	int start2 = str.lastIndexOf("public class");
Lines 14236-14242 Link Here
14236
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14236
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14237
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14237
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14238
14238
14239
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14239
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14240
	int start1 = str.lastIndexOf("foo") + "".length();
14240
	int start1 = str.lastIndexOf("foo") + "".length();
14241
	int end1 = start1 + "foo".length();
14241
	int end1 = start1 + "foo".length();
14242
	int start2 = str.lastIndexOf("public class");
14242
	int start2 = str.lastIndexOf("public class");
Lines 14276-14282 Link Here
14276
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14276
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14277
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14277
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14278
	
14278
	
14279
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14279
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14280
	int start1 = str.lastIndexOf("foo") + "".length();
14280
	int start1 = str.lastIndexOf("foo") + "".length();
14281
	int end1 = start1 + "foo".length();
14281
	int end1 = start1 + "foo".length();
14282
	int start2 = str.lastIndexOf("public class Test");
14282
	int start2 = str.lastIndexOf("public class Test");
Lines 14284-14290 Link Here
14284
	assertResults(
14284
	assertResults(
14285
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
14285
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
14286
			"   ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
14286
			"   ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
14287
			"Test.foo[TYPE_REF]{foo, test, Ltest.Test$foo;, null, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14287
			"Test.foo[TYPE_REF]{foo, test, Ltest.Test$foo;, null, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14288
			requestor.getResults());
14288
			requestor.getResults());
14289
}
14289
}
14290
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
14290
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 14318-14324 Link Here
14318
	int start1 = str.lastIndexOf("foo") + "".length();
14318
	int start1 = str.lastIndexOf("foo") + "".length();
14319
	int end1 = start1 + "foo".length();
14319
	int end1 = start1 + "foo".length();
14320
	assertResults(
14320
	assertResults(
14321
			"foo[METHOD_REF]{foo(), Ltest.Test;, ()V, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14321
			"foo[METHOD_REF]{foo(), Ltest.Test;, ()V, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14322
			requestor.getResults());
14322
			requestor.getResults());
14323
}
14323
}
14324
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
14324
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 14350-14356 Link Here
14350
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14350
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14351
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14351
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14352
14352
14353
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14353
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14354
	int start1 = str.lastIndexOf("foo") + "".length();
14354
	int start1 = str.lastIndexOf("foo") + "".length();
14355
	int end1 = start1 + "foo".length();
14355
	int end1 = start1 + "foo".length();
14356
	int start2 = str.lastIndexOf("public class Test");
14356
	int start2 = str.lastIndexOf("public class Test");
Lines 14358-14364 Link Here
14358
	assertResults(
14358
	assertResults(
14359
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
14359
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
14360
			"   ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
14360
			"   ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
14361
			"foo[FIELD_REF]{foo, Ltest.Test;, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14361
			"foo[FIELD_REF]{foo, Ltest.Test;, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14362
			requestor.getResults());
14362
			requestor.getResults());
14363
}
14363
}
14364
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
14364
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 14390-14396 Link Here
14390
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14390
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14391
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14391
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14392
14392
14393
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14393
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14394
	int start1 = str.lastIndexOf("foo") + "".length();
14394
	int start1 = str.lastIndexOf("foo") + "".length();
14395
	int end1 = start1 + "foo".length();
14395
	int end1 = start1 + "foo".length();
14396
	int start2 = str.lastIndexOf("public class Test");
14396
	int start2 = str.lastIndexOf("public class Test");
Lines 14398-14404 Link Here
14398
	assertResults(
14398
	assertResults(
14399
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
14399
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
14400
			"   ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
14400
			"   ZZZ[TYPE_IMPORT]{import test.p.ZZZ;\n, test.p, Ltest.p.ZZZ;, null, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
14401
			"foo[LOCAL_VARIABLE_REF]{foo, null, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14401
			"foo[LOCAL_VARIABLE_REF]{foo, null, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
14402
			requestor.getResults());
14402
			requestor.getResults());
14403
}
14403
}
14404
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
14404
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 14430-14436 Link Here
14430
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14430
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14431
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14431
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14432
14432
14433
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14433
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14434
	int start1 = str.lastIndexOf("foo") + "".length();
14434
	int start1 = str.lastIndexOf("foo") + "".length();
14435
	int end1 = start1 + "foo".length();
14435
	int end1 = start1 + "foo".length();
14436
	int start2 = str.lastIndexOf("public class Test");
14436
	int start2 = str.lastIndexOf("public class Test");
Lines 14503-14509 Link Here
14503
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14503
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14504
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14504
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14505
14505
14506
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14506
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14507
	int start1 = str.lastIndexOf("foo") + "".length();
14507
	int start1 = str.lastIndexOf("foo") + "".length();
14508
	int end1 = start1 + "foo".length();
14508
	int end1 = start1 + "foo".length();
14509
	int start2 = str.lastIndexOf("/** */");
14509
	int start2 = str.lastIndexOf("/** */");
Lines 14673-14679 Link Here
14673
	int start1 = str.lastIndexOf("foo") + "".length();
14673
	int start1 = str.lastIndexOf("foo") + "".length();
14674
	int end1 = start1 + "foo".length();
14674
	int end1 = start1 + "foo".length();
14675
	assertResults(
14675
	assertResults(
14676
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
14676
			"foo[METHOD_REF]{ZZZ.foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
14677
			requestor.getResults());
14677
			requestor.getResults());
14678
}
14678
}
14679
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
14679
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 14711-14717 Link Here
14711
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14711
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14712
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14712
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14713
		
14713
		
14714
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14714
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14715
		int start1 = str.lastIndexOf("foo") + "".length();
14715
		int start1 = str.lastIndexOf("foo") + "".length();
14716
		int end1 = start1 + "foo".length();
14716
		int end1 = start1 + "foo".length();
14717
		int start2 = str.lastIndexOf("public class");
14717
		int start2 = str.lastIndexOf("public class");
Lines 14759-14765 Link Here
14759
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14759
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
14760
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14760
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14761
		
14761
		
14762
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14762
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
14763
		int start1 = str.lastIndexOf("foo") + "".length();
14763
		int start1 = str.lastIndexOf("foo") + "".length();
14764
		int end1 = start1 + "foo".length();
14764
		int end1 = start1 + "foo".length();
14765
		int start2 = str.lastIndexOf("public class");
14765
		int start2 = str.lastIndexOf("public class");
Lines 14790-14796 Link Here
14790
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14790
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14791
	
14791
	
14792
	assertResults(
14792
	assertResults(
14793
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
14793
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
14794
		requestor.getResults());
14794
		requestor.getResults());
14795
}
14795
}
14796
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
14796
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
Lines 14818-14826 Link Here
14818
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14818
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14819
14819
14820
	assertResults(
14820
	assertResults(
14821
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14821
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14822
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14822
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14823
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14823
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14824
			requestor.getResults());
14824
			requestor.getResults());
14825
}
14825
}
14826
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
14826
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
Lines 14849-14857 Link Here
14849
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14849
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14850
14850
14851
	assertResults(
14851
	assertResults(
14852
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14852
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14853
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14853
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14854
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14854
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14855
			requestor.getResults());
14855
			requestor.getResults());
14856
}
14856
}
14857
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
14857
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
Lines 14877-14885 Link Here
14877
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14877
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14878
14878
14879
	assertResults(
14879
	assertResults(
14880
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14880
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14881
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14881
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14882
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14882
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14883
			requestor.getResults());
14883
			requestor.getResults());
14884
}
14884
}
14885
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
14885
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
Lines 14906-14914 Link Here
14906
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14906
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14907
14907
14908
	assertResults(
14908
	assertResults(
14909
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14909
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14910
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14910
			"label3[LABEL_REF]{label3, null, null, label3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
14911
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14911
			"label4[LABEL_REF]{label4, null, null, label4, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14912
			requestor.getResults());
14912
			requestor.getResults());
14913
}
14913
}
14914
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
14914
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
Lines 14938-14944 Link Here
14938
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14938
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14939
14939
14940
	assertResults(
14940
	assertResults(
14941
			"label1[LABEL_REF]{label1, null, null, label1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14941
			"label1[LABEL_REF]{label1, null, null, label1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14942
			requestor.getResults());
14942
			requestor.getResults());
14943
}
14943
}
14944
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
14944
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=22072
Lines 14969-14975 Link Here
14969
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14969
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
14970
14970
14971
	assertResults(
14971
	assertResults(
14972
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14972
			"label2[LABEL_REF]{label2, null, null, label2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
14973
			requestor.getResults());
14974
}
14975
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
14976
public void testNameWithUnresolvedReferences001() throws JavaModelException {
14977
	this.workingCopies = new ICompilationUnit[1];
14978
	this.workingCopies[0] = getWorkingCopy(
14979
			"/Completion/src3/test/Test.java",
14980
			"package test;\n" +
14981
			"public class Test {\n" +
14982
			"   void foo() {\n" +
14983
 			"      {\n" +
14984
 			"         int varzz1 = 0;\n" +
14985
			"         varzz1 = varzz2;\n" +
14986
			"         {\n" +
14987
			"            int varzz3 = 0;\n" +
14988
			"            varzz3 = varzz4;\n" +
14989
			"            int varzz5 = 0;\n" +
14990
			"         }\n" +
14991
			"         {\n" +
14992
			"            varzz1 = varzz5;\n" +
14993
			"         }\n" +
14994
			"         int zzvarzz = 0;\n" +
14995
			"         /**/varzz\n" +
14996
			"         int varzz6 = 0;\n" +
14997
			"         varzz6 = varzz7;\n" +
14998
			"         {\n" +
14999
			"            int varzz8 = 0;\n" +
15000
			"            varzz8 = varzz9;\n" +
15001
 			"         }\n" +
15002
 			"      }\n" +
15003
 			"      int varzz10 = 0;\n" +
15004
			"      varzz10= varzz11;\n" +
15005
			"   }\n" +
15006
			"}\n");
15007
	
15008
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15009
	
15010
	String str = this.workingCopies[0].getSource();
15011
	String completeBehind = "/**/varzz";
15012
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15013
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15014
	
15015
	assertResults(
15016
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15017
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15018
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, Ljava.lang.Object;, varzz5, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15019
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15020
			requestor.getResults());
15021
}
15022
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15023
public void testNameWithUnresolvedReferences002() throws JavaModelException {
15024
	this.workingCopies = new ICompilationUnit[1];
15025
	this.workingCopies[0] = getWorkingCopy(
15026
			"/Completion/src3/test/Test.java",
15027
			"package test;\n" +
15028
			"public class Test {\n" +
15029
			"   {\n" +
15030
			"      {\n" +
15031
 			"         int varzz1 = 0;\n" +
15032
			"         varzz1 = varzz2;\n" +
15033
			"         {\n" +
15034
			"            int varzz3 = 0;\n" +
15035
			"            varzz3 = varzz4;\n" +
15036
			"            int varzz5 = 0;\n" +
15037
			"         }\n" +
15038
			"         {\n" +
15039
			"            varzz1 = varzz5;\n" +
15040
			"         }\n" +
15041
			"         /**/varzz\n" +
15042
			"         int varzz6 = 0;\n" +
15043
			"         varzz6 = varzz7;\n" +
15044
			"         {\n" +
15045
			"            int varzz8 = 0;\n" +
15046
			"            varzz8 = varzz9;\n" +
15047
 			"         }\n" +
15048
 			"      }\n" +
15049
 			"      int varzz10 = 0;\n" +
15050
			"      varzz10= varzz11;\n" +
15051
			"   }\n" +
15052
			"}\n");
15053
	
15054
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15055
	
15056
	String str = this.workingCopies[0].getSource();
15057
	String completeBehind = "/**/varzz";
15058
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15059
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15060
	
15061
	assertResults(
15062
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15063
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15064
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, Ljava.lang.Object;, varzz5, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15065
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15066
			requestor.getResults());
15067
}
15068
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15069
public void testNameWithUnresolvedReferences003() throws JavaModelException {
15070
	this.workingCopies = new ICompilationUnit[1];
15071
	this.workingCopies[0] = getWorkingCopy(
15072
			"/Completion/src3/test/Test.java",
15073
			"package test;\n" +
15074
			"public class Test {\n" +
15075
			"   void foo() {\n" +
15076
 			"      int varzz1 = 0;\n" +
15077
			"      varzz1 = varzz2;\n" +
15078
			"      new Object() {\n" +
15079
			"         int varzz3 = varzz4;\n" +
15080
			"         {\n" +
15081
			"            varzz3 = varzz5;\n" +
15082
			"            int varzz6 = 0;\n" +
15083
			"            varzz6 = varzz7;\n" +
15084
			"         }\n" +
15085
			"      };\n" +
15086
			"      /**/varzz\n" +
15087
 			"   }\n" +
15088
			"}\n");
15089
	
15090
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15091
	
15092
	String str = this.workingCopies[0].getSource();
15093
	String completeBehind = "/**/varzz";
15094
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15095
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15096
	
15097
	assertResults(
15098
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15099
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15100
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, Ljava.lang.Object;, varzz5, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15101
			"varzz7[LOCAL_VARIABLE_REF]{varzz7, null, Ljava.lang.Object;, varzz7, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15102
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15103
			requestor.getResults());
15104
}
15105
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15106
public void testNameWithUnresolvedReferences004() throws JavaModelException {
15107
	this.workingCopies = new ICompilationUnit[1];
15108
	
15109
	String source = 
15110
		"package test;\n" +
15111
		"public class Test {\n" +
15112
		"   void foo() {\n" +
15113
		"      int varzz1 = 0;\n" +
15114
		"      varzz1 = varzz2;\n" +
15115
		"      new Object() {\n" +
15116
		"         int varzz3 = varzz4;\n";
15117
	for (int i = 0; i < 100; i++) {
15118
		source += "\n";
15119
	}
15120
	source +=
15121
		"         int varzz5 = varzz6;\n" +
15122
		"         int varzz7 = 0;\n" +
15123
		"         {\n" +
15124
		"            varzz3 = varzz1;\n" +
15125
		"            varzz5 = varzz8;\n" +
15126
		"            int varzz9 = 0;\n" +
15127
		"            varzz9 = varzz10;\n" +
15128
		"         }\n" +
15129
		"      };\n" +
15130
		"      /**/varzz\n" +
15131
		"   }\n" +
15132
		"}\n";
15133
	
15134
	this.workingCopies[0] = getWorkingCopy(
15135
			"/Completion/src3/test/Test.java",
15136
			source);
15137
	
15138
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15139
	
15140
	String str = this.workingCopies[0].getSource();
15141
	String completeBehind = "/**/varzz";
15142
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15143
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15144
	
15145
	assertResults(
15146
			"varzz10[LOCAL_VARIABLE_REF]{varzz10, null, Ljava.lang.Object;, varzz10, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15147
			"varzz3[LOCAL_VARIABLE_REF]{varzz3, null, Ljava.lang.Object;, varzz3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15148
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, Ljava.lang.Object;, varzz6, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15149
			"varzz8[LOCAL_VARIABLE_REF]{varzz8, null, Ljava.lang.Object;, varzz8, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15150
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15151
			requestor.getResults());
15152
}
15153
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15154
public void testNameWithUnresolvedReferences005() throws JavaModelException {
15155
	this.workingCopies = new ICompilationUnit[1];
15156
	
15157
	String source = 
15158
		"package test;\n" +
15159
		"public class Test {\n" +
15160
		"   void foo() {\n" +
15161
		"      int varzz1 = 0;\n" +
15162
		"      varzz1 = varzz2;\n" +
15163
		"      new Object() {\n" +
15164
		"         int varzz3 = varzz4;\n";
15165
	for (int i = 0; i < 100; i++) {
15166
		source += "\n";
15167
	}
15168
	source +=
15169
		"         int varzz5 = varzz6;\n" +
15170
		"         int varzz7(){}\n" +
15171
		"         {\n" +
15172
		"            varzz3 = varzz1;\n" +
15173
		"            varzz5 = varzz8;\n" +
15174
		"            int varzz9 = 0;\n" +
15175
		"            varzz9 = varzz10;\n" +
15176
		"         }\n" +
15177
		"      };\n" +
15178
		"      /**/varzz\n" +
15179
		"   }\n" +
15180
		"}\n";
15181
	
15182
	this.workingCopies[0] = getWorkingCopy(
15183
			"/Completion/src3/test/Test.java",
15184
			source);
15185
	
15186
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15187
	
15188
	String str = this.workingCopies[0].getSource();
15189
	String completeBehind = "/**/varzz";
15190
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15191
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15192
	
15193
	assertResults(
15194
			"varzz10[LOCAL_VARIABLE_REF]{varzz10, null, Ljava.lang.Object;, varzz10, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15195
			"varzz3[LOCAL_VARIABLE_REF]{varzz3, null, Ljava.lang.Object;, varzz3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15196
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, Ljava.lang.Object;, varzz6, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15197
			"varzz8[LOCAL_VARIABLE_REF]{varzz8, null, Ljava.lang.Object;, varzz8, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15198
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15199
			requestor.getResults());
15200
}
15201
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15202
public void testNameWithUnresolvedReferences006() throws JavaModelException {
15203
	this.workingCopies = new ICompilationUnit[1];
15204
	
15205
	String source = 
15206
		"package test;\n" +
15207
		"public class Test {\n" +
15208
		"   void foo() {\n" +
15209
		"      int varzz1 = 0;\n" +
15210
		"      varzz1 = varzz2;\n" +
15211
		"      new Object() {\n" +
15212
		"         int varzz3 = varzz4;\n";
15213
	for (int i = 0; i < 100; i++) {
15214
		source += "\n";
15215
	}
15216
	source +=
15217
		"         int varzz5 = varzz6;\n" +
15218
		"         int varzz7()\n" +
15219
		"         {\n" +
15220
		"            varzz3 = varzz1;\n" +
15221
		"            varzz5 = varzz8;\n" +
15222
		"            int varzz9 = 0;\n" +
15223
		"            varzz9 = varzz10;\n" +
15224
		"         }\n" +
15225
		"      };\n" +
15226
		"      /**/varzz\n" +
15227
		"   }\n" +
15228
		"}\n";
15229
	
15230
	this.workingCopies[0] = getWorkingCopy(
15231
			"/Completion/src3/test/Test.java",
15232
			source);
15233
	
15234
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15235
	
15236
	String str = this.workingCopies[0].getSource();
15237
	String completeBehind = "/**/varzz";
15238
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15239
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15240
	
15241
	assertResults(
15242
			"varzz10[LOCAL_VARIABLE_REF]{varzz10, null, Ljava.lang.Object;, varzz10, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15243
			"varzz3[LOCAL_VARIABLE_REF]{varzz3, null, Ljava.lang.Object;, varzz3, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15244
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, Ljava.lang.Object;, varzz6, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15245
			"varzz8[LOCAL_VARIABLE_REF]{varzz8, null, Ljava.lang.Object;, varzz8, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15246
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15247
			requestor.getResults());
15248
}
15249
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15250
public void testNameWithUnresolvedReferences007() throws JavaModelException {
15251
	this.workingCopies = new ICompilationUnit[1];
15252
	
15253
	String source = 
15254
		"package test;\n" +
15255
		"public class Test {\n" +
15256
		"   void foo() {\n" +
15257
		"      int varzz1 = 0;\n" +
15258
		"      varzz1 = varzz2;\n" +
15259
		"      new Object() {\n" +
15260
		"         int varzz3 = varzz4;\n" +
15261
		"         void foo (){\n" +
15262
		"            int varzz5 = 0;\n" +
15263
		"            varzz5 = varzz6;\n" +
15264
		"            /**/varzz\n" +
15265
		"         }\n" +
15266
		"      };\n" +
15267
		"   }\n" +
15268
		"}\n";
15269
	
15270
	this.workingCopies[0] = getWorkingCopy(
15271
			"/Completion/src3/test/Test.java",
15272
			source);
15273
	
15274
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15275
	
15276
	String str = this.workingCopies[0].getSource();
15277
	String completeBehind = "/**/varzz";
15278
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15279
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15280
	
15281
	assertResults(
15282
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15283
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15284
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, Ljava.lang.Object;, varzz6, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15285
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15286
			"varzz3[FIELD_REF]{varzz3, LObject;, I, varzz3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15287
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, I, varzz5, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
15288
			requestor.getResults());
15289
}
15290
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
15291
public void testNameWithUnresolvedReferences008() throws JavaModelException {
15292
	this.workingCopies = new ICompilationUnit[1];
15293
	
15294
	String source = 
15295
		"package test;\n" +
15296
		"public class Test {\n" +
15297
		"   {\n" +
15298
		"      int varzz1 = 0;\n" +
15299
		"      varzz1 = varzz2;\n" +
15300
		"      new Object() {\n" +
15301
		"         int varzz3 = varzz4;\n" +
15302
		"         {\n" +
15303
		"            int varzz5 = 0;\n" +
15304
		"            varzz5 = varzz6;\n" +
15305
		"            /**/varzz\n" +
15306
		"         }\n" +
15307
		"      };\n" +
15308
		"   }\n" +
15309
		"}\n";
15310
	
15311
	this.workingCopies[0] = getWorkingCopy(
15312
			"/Completion/src3/test/Test.java",
15313
			source);
15314
	
15315
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
15316
	
15317
	String str = this.workingCopies[0].getSource();
15318
	String completeBehind = "/**/varzz";
15319
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
15320
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15321
	
15322
	assertResults(
15323
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15324
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15325
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, Ljava.lang.Object;, varzz6, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15326
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15327
			"varzz3[FIELD_REF]{varzz3, LObject;, I, varzz3, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
15328
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, I, varzz5, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
14973
			requestor.getResults());
15329
			requestor.getResults());
14974
}
15330
}
14975
public void testParameterNames1() throws CoreException, IOException {
15331
public void testParameterNames1() throws CoreException, IOException {
Lines 15006-15012 Link Here
15006
			this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15362
			this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15007
			
15363
			
15008
			assertResults(
15364
			assertResults(
15009
				"foo[METHOD_REF]{foo(), Ldoctest.X;, (Ljava.lang.Object;)V, foo, (param), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
15365
				"foo[METHOD_REF]{foo(), Ldoctest.X;, (Ljava.lang.Object;)V, foo, (param), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
15010
				requestor.getResults());
15366
				requestor.getResults());
15011
		} finally {
15367
		} finally {
15012
			removeLibrary("Completion", "tmpDoc.jar");
15368
			removeLibrary("Completion", "tmpDoc.jar");
Lines 15055-15068 Link Here
15055
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15411
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
15056
15412
15057
	assertResults(
15413
	assertResults(
15058
			"supeStaticMethod[METHOD_REF]{supeStaticMethod(), Ltest.SuperStaticMembers;, ()I, supeStaticMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
15414
			"supeStaticMethod[METHOD_REF]{supeStaticMethod(), Ltest.SuperStaticMembers;, ()I, supeStaticMethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
15059
			"superStaticField[FIELD_REF]{superStaticField, Ltest.SuperStaticMembers;, I, superStaticField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
15415
			"superStaticField[FIELD_REF]{superStaticField, Ltest.SuperStaticMembers;, I, superStaticField, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
15060
			"StaticMembers.Clazz[TYPE_REF]{Clazz, test, Ltest.StaticMembers$Clazz;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15416
			"StaticMembers.Clazz[TYPE_REF]{Clazz, test, Ltest.StaticMembers$Clazz;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15061
			"StaticMembers.StaticClazz[TYPE_REF]{StaticClazz, test, Ltest.StaticMembers$StaticClazz;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15417
			"StaticMembers.StaticClazz[TYPE_REF]{StaticClazz, test, Ltest.StaticMembers$StaticClazz;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15062
			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15418
			"class[FIELD_REF]{class, null, Ljava.lang.Class;, class, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15063
			"staticField[FIELD_REF]{staticField, Ltest.StaticMembers;, I, staticField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15419
			"staticField[FIELD_REF]{staticField, Ltest.StaticMembers;, I, staticField, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15064
			"staticMethod[METHOD_REF]{staticMethod(), Ltest.StaticMembers;, ()I, staticMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15420
			"staticMethod[METHOD_REF]{staticMethod(), Ltest.StaticMembers;, ()I, staticMethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}\n" +
15065
			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
15421
			"this[KEYWORD]{this, null, null, this, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
15066
			requestor.getResults());
15422
			requestor.getResults());
15067
}
15423
}
15068
}
15424
}
(-)src/org/eclipse/jdt/core/tests/model/CompletionTests_1_5.java (-442 / +593 lines)
Lines 125-131 Link Here
125
	cu.codeComplete(cursorLocation, requestor);
125
	cu.codeComplete(cursorLocation, requestor);
126
	
126
	
127
	assertEquals("should have one class",
127
	assertEquals("should have one class",
128
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
128
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
129
		requestor.getResults());
129
		requestor.getResults());
130
}
130
}
131
public void test0002() throws JavaModelException {
131
public void test0002() throws JavaModelException {
Lines 138-144 Link Here
138
	cu.codeComplete(cursorLocation, requestor);
138
	cu.codeComplete(cursorLocation, requestor);
139
	
139
	
140
	assertEquals("should have one class",
140
	assertEquals("should have one class",
141
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
141
		"element:Object    completion:Object    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
142
		requestor.getResults());
142
		requestor.getResults());
143
}
143
}
144
public void test0003() throws JavaModelException {
144
public void test0003() throws JavaModelException {
Lines 151-157 Link Here
151
	cu.codeComplete(cursorLocation, requestor);
151
	cu.codeComplete(cursorLocation, requestor);
152
	
152
	
153
	assertEquals("should have one class",
153
	assertEquals("should have one class",
154
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED),
154
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED),
155
		requestor.getResults());
155
		requestor.getResults());
156
}
156
}
157
public void test0004() throws JavaModelException {
157
public void test0004() throws JavaModelException {
Lines 164-171 Link Here
164
	cu.codeComplete(cursorLocation, requestor);
164
	cu.codeComplete(cursorLocation, requestor);
165
	
165
	
166
	assertEquals("should have one class",
166
	assertEquals("should have one class",
167
		"element:XZX    completion:XZX    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
167
		"element:XZX    completion:XZX    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
168
		"element:XZXSuper    completion:XZXSuper    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED),
168
		"element:XZXSuper    completion:XZXSuper    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED),
169
		requestor.getResults());
169
		requestor.getResults());
170
}
170
}
171
public void test0005() throws JavaModelException {
171
public void test0005() throws JavaModelException {
Lines 191-197 Link Here
191
            result.context);
191
            result.context);
192
    
192
    
193
    assertResults(
193
    assertResults(
194
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
194
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
195
            result.proposals);
195
            result.proposals);
196
}
196
}
197
public void test0006() throws JavaModelException {
197
public void test0006() throws JavaModelException {
Lines 217-223 Link Here
217
            result.context);
217
            result.context);
218
    
218
    
219
    assertResults(
219
    assertResults(
220
            "Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
220
            "Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
221
            result.proposals);
221
            result.proposals);
222
}
222
}
223
public void test0007() throws JavaModelException {
223
public void test0007() throws JavaModelException {
Lines 243-249 Link Here
243
            result.context);
243
            result.context);
244
    
244
    
245
    assertResults(
245
    assertResults(
246
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) +"}",
246
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) +"}",
247
            result.proposals);
247
            result.proposals);
248
}
248
}
249
public void test0008() throws JavaModelException {
249
public void test0008() throws JavaModelException {
Lines 275-282 Link Here
275
            result.context);
275
            result.context);
276
    
276
    
277
    assertResults(
277
    assertResults(
278
            "XYX[TYPE_REF]{XYX, test0008, Ltest0008.XYX;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
278
            "XYX[TYPE_REF]{XYX, test0008, Ltest0008.XYX;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}\n"+
279
			"XYXSuper[TYPE_REF]{XYXSuper, test0008, Ltest0008.XYXSuper;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}",
279
			"XYXSuper[TYPE_REF]{XYXSuper, test0008, Ltest0008.XYXSuper;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED)+"}",
280
			result.proposals);
280
			result.proposals);
281
}
281
}
282
public void test0009() throws JavaModelException {
282
public void test0009() throws JavaModelException {
Lines 289-296 Link Here
289
	cu.codeComplete(cursorLocation, requestor);
289
	cu.codeComplete(cursorLocation, requestor);
290
	
290
	
291
	assertEquals("should have one class",
291
	assertEquals("should have one class",
292
		"element:T_1    completion:T_1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
292
		"element:T_1    completion:T_1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
293
		"element:T_2    completion:T_2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
293
		"element:T_2    completion:T_2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
294
		requestor.getResults());
294
		requestor.getResults());
295
}
295
}
296
public void test0010() throws JavaModelException {
296
public void test0010() throws JavaModelException {
Lines 303-312 Link Here
303
	cu.codeComplete(cursorLocation, requestor);
303
	cu.codeComplete(cursorLocation, requestor);
304
	
304
	
305
	assertEquals("should have one class",
305
	assertEquals("should have one class",
306
		"element:T_1    completion:T_1    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
306
		"element:T_1    completion:T_1    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
307
		"element:T_2    completion:T_2    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
307
		"element:T_2    completion:T_2    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
308
		"element:T_3    completion:T_3    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
308
		"element:T_3    completion:T_3    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+"\n"+
309
		"element:T_4    completion:T_4    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
309
		"element:T_4    completion:T_4    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
310
		requestor.getResults());
310
		requestor.getResults());
311
}
311
}
312
public void test0011() throws JavaModelException {
312
public void test0011() throws JavaModelException {
Lines 329-335 Link Here
329
            result.context);
329
            result.context);
330
    
330
    
331
    assertResults(
331
    assertResults(
332
            "Z0011<java.lang.Object>.Y0011[TYPE_REF]{Y0011, test0011, Ltest0011.Z0011<Ljava.lang.Object;>.Y0011;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
332
            "Z0011<java.lang.Object>.Y0011[TYPE_REF]{Y0011, test0011, Ltest0011.Z0011<Ljava.lang.Object;>.Y0011;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED)+"}",
333
            result.proposals);
333
            result.proposals);
334
}
334
}
335
public void test0012() throws JavaModelException {
335
public void test0012() throws JavaModelException {
Lines 352-358 Link Here
352
            result.context);
352
            result.context);
353
    
353
    
354
    assertResults(
354
    assertResults(
355
            "Z0012<java.lang.Object>.Y0012[TYPE_REF]{Y0012, test0012, Ltest0012.Z0012<Ljava.lang.Object;>.Y0012;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
355
            "Z0012<java.lang.Object>.Y0012[TYPE_REF]{Y0012, test0012, Ltest0012.Z0012<Ljava.lang.Object;>.Y0012;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
356
            result.proposals);
356
            result.proposals);
357
}
357
}
358
public void test0013() throws JavaModelException {
358
public void test0013() throws JavaModelException {
Lines 375-381 Link Here
375
            result.context);
375
            result.context);
376
    
376
    
377
    assertResults(
377
    assertResults(
378
            "Z0013<java.lang.Object>.Y0013[TYPE_REF]{Y0013, test0013, Ltest0013.Z0013<Ljava.lang.Object;>.Y0013;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
378
            "Z0013<java.lang.Object>.Y0013[TYPE_REF]{Y0013, test0013, Ltest0013.Z0013<Ljava.lang.Object;>.Y0013;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
379
            result.proposals);
379
            result.proposals);
380
}
380
}
381
public void test0014() throws JavaModelException {
381
public void test0014() throws JavaModelException {
Lines 397-403 Link Here
397
            result.context);
397
            result.context);
398
    
398
    
399
    assertResults(
399
    assertResults(
400
            "Z0014<java.lang.Object>.Y0014[TYPE_REF]{Y0014, test0014, Ltest0014.Z0014<Ljava.lang.Object;>.Y0014;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) +"}",
400
            "Z0014<java.lang.Object>.Y0014[TYPE_REF]{Y0014, test0014, Ltest0014.Z0014<Ljava.lang.Object;>.Y0014;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) +"}",
401
            result.proposals);
401
            result.proposals);
402
}
402
}
403
public void test0015() throws JavaModelException {
403
public void test0015() throws JavaModelException {
Lines 421-428 Link Here
421
            result.context);
421
            result.context);
422
    
422
    
423
    assertResults(
423
    assertResults(
424
            "Z0015<java.lang.Object>.Y0015[TYPE_REF]{Y0015, test0015, Ltest0015.Z0015<Ljava.lang.Object;>.Y0015;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}\n" +
424
            "Z0015<java.lang.Object>.Y0015[TYPE_REF]{Y0015, test0015, Ltest0015.Z0015<Ljava.lang.Object;>.Y0015;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}\n" +
425
            "Z0015<java.lang.Object>.Y0015I[TYPE_REF]{Y0015I, test0015, Ltest0015.Z0015<Ljava.lang.Object;>.Y0015I;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED) +"}",
425
            "Z0015<java.lang.Object>.Y0015I[TYPE_REF]{Y0015I, test0015, Ltest0015.Z0015<Ljava.lang.Object;>.Y0015I;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE+ R_NON_RESTRICTED) +"}",
426
            result.proposals);
426
            result.proposals);
427
}
427
}
428
public void test0016() throws JavaModelException {
428
public void test0016() throws JavaModelException {
Lines 447-453 Link Here
447
            result.context);
447
            result.context);
448
    
448
    
449
    assertResults(
449
    assertResults(
450
            "Z0016<java.lang.Object>.Y0016[TYPE_REF]{Y0016, test0016, Ltest0016.Z0016<Ljava.lang.Object;>.Y0016;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
450
            "Z0016<java.lang.Object>.Y0016[TYPE_REF]{Y0016, test0016, Ltest0016.Z0016<Ljava.lang.Object;>.Y0016;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
451
            result.proposals);
451
            result.proposals);
452
}
452
}
453
public void test0017() throws JavaModelException {
453
public void test0017() throws JavaModelException {
Lines 472-478 Link Here
472
            result.context);
472
            result.context);
473
    
473
    
474
    assertResults(
474
    assertResults(
475
            "Z0017<java.lang.Object>.Y0017[TYPE_REF]{Y0017, test0017, Ltest0017.Z0017<Ljava.lang.Object;>.Y0017;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
475
            "Z0017<java.lang.Object>.Y0017[TYPE_REF]{Y0017, test0017, Ltest0017.Z0017<Ljava.lang.Object;>.Y0017;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
476
            result.proposals);
476
            result.proposals);
477
}
477
}
478
public void test0018() throws JavaModelException {
478
public void test0018() throws JavaModelException {
Lines 497-503 Link Here
497
            result.context);
497
            result.context);
498
    
498
    
499
    assertResults(
499
    assertResults(
500
            "Z0018<java.lang.Object>.Y0018[TYPE_REF]{Y0018, test0018, Ltest0018.Z0018<Ljava.lang.Object;>.Y0018;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
500
            "Z0018<java.lang.Object>.Y0018[TYPE_REF]{Y0018, test0018, Ltest0018.Z0018<Ljava.lang.Object;>.Y0018;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
501
            result.proposals);
501
            result.proposals);
502
}
502
}
503
public void test0019() throws JavaModelException {
503
public void test0019() throws JavaModelException {
Lines 520-526 Link Here
520
            result.context);
520
            result.context);
521
    
521
    
522
    assertResults(
522
    assertResults(
523
            "Z0019<java.lang.Object>.Y0019[TYPE_REF]{Y0019, test0019, Ltest0019.Z0019<Ljava.lang.Object;>.Y0019;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
523
            "Z0019<java.lang.Object>.Y0019[TYPE_REF]{Y0019, test0019, Ltest0019.Z0019<Ljava.lang.Object;>.Y0019;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
524
            result.proposals);
524
            result.proposals);
525
}
525
}
526
public void test0020() throws JavaModelException {
526
public void test0020() throws JavaModelException {
Lines 545-551 Link Here
545
            result.context);
545
            result.context);
546
    
546
    
547
    assertResults(
547
    assertResults(
548
            "Z0020<java.lang.Object>.Y0020[TYPE_REF]{Y0020, test0020, Ltest0020.Z0020<Ljava.lang.Object;>.Y0020;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
548
            "Z0020<java.lang.Object>.Y0020[TYPE_REF]{Y0020, test0020, Ltest0020.Z0020<Ljava.lang.Object;>.Y0020;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) +"}",
549
            result.proposals);
549
            result.proposals);
550
}
550
}
551
public void test0021() throws JavaModelException {
551
public void test0021() throws JavaModelException {
Lines 573-580 Link Here
573
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
573
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
574
	
574
	
575
	assertResults(
575
	assertResults(
576
			"Z0021Z[TYPE_REF]{Z0021Z, test0021, Ltest0021.Z0021Z;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
576
			"Z0021Z[TYPE_REF]{Z0021Z, test0021, Ltest0021.Z0021Z;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
577
			"Z0021ZZ[TYPE_REF]{Z0021ZZ, test0021, Ltest0021.Z0021ZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
577
			"Z0021ZZ[TYPE_REF]{Z0021ZZ, test0021, Ltest0021.Z0021ZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
578
			requestor.getResults());
578
			requestor.getResults());
579
}
579
}
580
public void test0022() throws JavaModelException {
580
public void test0022() throws JavaModelException {
Lines 605-612 Link Here
605
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
605
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
606
	
606
	
607
	assertResults(
607
	assertResults(
608
			"Z0022ZZZ[TYPE_REF]{Z0022ZZZ, test0022, Ltest0022.Z0022ZZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
608
			"Z0022ZZZ[TYPE_REF]{Z0022ZZZ, test0022, Ltest0022.Z0022ZZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
609
			"Z0022ZZ[TYPE_REF]{Z0022ZZ, test0022, Ltest0022.Z0022ZZ;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
609
			"Z0022ZZ[TYPE_REF]{Z0022ZZ, test0022, Ltest0022.Z0022ZZ;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
610
			requestor.getResults());
610
			requestor.getResults());
611
}
611
}
612
public void test0023() throws JavaModelException {
612
public void test0023() throws JavaModelException {
Lines 645-651 Link Here
645
	cu.codeComplete(cursorLocation, requestor);
645
	cu.codeComplete(cursorLocation, requestor);
646
	
646
	
647
	assertEquals("should have one class",
647
	assertEquals("should have one class",
648
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
648
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
649
		requestor.getResults());
649
		requestor.getResults());
650
}
650
}
651
public void test0026() throws JavaModelException {
651
public void test0026() throws JavaModelException {
Lines 672-678 Link Here
672
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
672
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
673
	
673
	
674
	assertResults(
674
	assertResults(
675
			"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
675
			"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
676
			requestor.getResults());
676
			requestor.getResults());
677
}
677
}
678
public void test0027() throws JavaModelException {
678
public void test0027() throws JavaModelException {
Lines 699-705 Link Here
699
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
699
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
700
	
700
	
701
	assertResults(
701
	assertResults(
702
			"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
702
			"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
703
			requestor.getResults());
703
			requestor.getResults());
704
	
704
	
705
	
705
	
Lines 714-720 Link Here
714
	cu.codeComplete(cursorLocation, requestor);
714
	cu.codeComplete(cursorLocation, requestor);
715
	
715
	
716
	assertEquals("should have one class",
716
	assertEquals("should have one class",
717
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED),
717
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED),
718
		requestor.getResults());
718
		requestor.getResults());
719
}
719
}
720
public void test0029() throws JavaModelException {
720
public void test0029() throws JavaModelException {
Lines 732-739 Link Here
732
            "/**/Inner2");
732
            "/**/Inner2");
733
    
733
    
734
    assertResults(
734
    assertResults(
735
            "Inner2[POTENTIAL_METHOD_DECLARATION]{Inner2, Ltest0029.Test$Inner;, ()V, Inner2, null, "+(R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
735
            "Inner2[POTENTIAL_METHOD_DECLARATION]{Inner2, Ltest0029.Test$Inner;, ()V, Inner2, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED)+"}\n"+
736
            "Test.Inner2<T>[TYPE_REF]{Inner2, test0029, Ltest0029.Test$Inner2<TT;>;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
736
            "Test.Inner2<T>[TYPE_REF]{Inner2, test0029, Ltest0029.Test$Inner2<TT;>;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
737
            result.proposals);
737
            result.proposals);
738
}
738
}
739
public void test0030() throws JavaModelException {
739
public void test0030() throws JavaModelException {
Lines 746-753 Link Here
746
	cu.codeComplete(cursorLocation, requestor);
746
	cu.codeComplete(cursorLocation, requestor);
747
	
747
	
748
	assertEquals("unexpected result",
748
	assertEquals("unexpected result",
749
		"element:ZZX    completion:ZZX    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
749
		"element:ZZX    completion:ZZX    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED)+ "\n" +
750
		"element:ZZY    completion:ZZY    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
750
		"element:ZZY    completion:ZZY    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED),
751
		requestor.getResults());
751
		requestor.getResults());
752
}
752
}
753
/*
753
/*
Lines 789-795 Link Here
789
	cu.codeComplete(cursorLocation, requestor);
789
	cu.codeComplete(cursorLocation, requestor);
790
	
790
	
791
	assertEquals("unexpected result",
791
	assertEquals("unexpected result",
792
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
792
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
793
		requestor.getResults());
793
		requestor.getResults());
794
}
794
}
795
/*
795
/*
Lines 805-811 Link Here
805
	cu.codeComplete(cursorLocation, requestor);
805
	cu.codeComplete(cursorLocation, requestor);
806
	
806
	
807
	assertEquals("unexpected result",
807
	assertEquals("unexpected result",
808
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
808
		"element:String    completion:String    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED),
809
		requestor.getResults());
809
		requestor.getResults());
810
}
810
}
811
/*
811
/*
Lines 928-934 Link Here
928
            result.context);
928
            result.context);
929
    
929
    
930
    assertResults(
930
    assertResults(
931
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE  + R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
931
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE  + R_UNQUALIFIED + R_NON_RESTRICTED) +"}",
932
            result.proposals);
932
            result.proposals);
933
}
933
}
934
/*
934
/*
Lines 957-963 Link Here
957
            result.context);
957
            result.context);
958
    
958
    
959
    assertResults(
959
    assertResults(
960
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED  + R_NON_RESTRICTED) +"}",
960
            "String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED  + R_NON_RESTRICTED) +"}",
961
            result.proposals);
961
            result.proposals);
962
}
962
}
963
/*
963
/*
Lines 1142-1148 Link Here
1142
	cu.codeComplete(cursorLocation, requestor);
1142
	cu.codeComplete(cursorLocation, requestor);
1143
	
1143
	
1144
	assertEquals("unexpected result",
1144
	assertEquals("unexpected result",
1145
		"element:bar    completion:bar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
1145
		"element:bar    completion:bar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
1146
		requestor.getResults());
1146
		requestor.getResults());
1147
}
1147
}
1148
/*
1148
/*
Lines 1158-1164 Link Here
1158
	cu.codeComplete(cursorLocation, requestor);
1158
	cu.codeComplete(cursorLocation, requestor);
1159
	
1159
	
1160
	assertEquals("unexpected result",
1160
	assertEquals("unexpected result",
1161
		"element:bar    completion:bar()    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
1161
		"element:bar    completion:bar()    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED),
1162
		requestor.getResults());
1162
		requestor.getResults());
1163
}
1163
}
1164
/*
1164
/*
Lines 1174-1180 Link Here
1174
	cu.codeComplete(cursorLocation, requestor);
1174
	cu.codeComplete(cursorLocation, requestor);
1175
	
1175
	
1176
	assertEquals("unexpected result",
1176
	assertEquals("unexpected result",
1177
		"element:T_0050    completion:T_0050    relevance:"+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
1177
		"element:T_0050    completion:T_0050    relevance:"+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED),
1178
		requestor.getResults());
1178
		requestor.getResults());
1179
}
1179
}
1180
1180
Lines 1207-1214 Link Here
1207
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1207
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1208
	
1208
	
1209
		assertResults(
1209
		assertResults(
1210
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1210
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1211
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1211
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1212
				requestor.getResults());
1212
				requestor.getResults());
1213
	} finally {
1213
	} finally {
1214
		this.discardWorkingCopies(qqTypes);
1214
		this.discardWorkingCopies(qqTypes);
Lines 1260-1273 Link Here
1260
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1260
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1261
	
1261
	
1262
		assertResults(
1262
		assertResults(
1263
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1263
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1264
				"QQType1.Inner2[TYPE_REF]{pkgstaticimport.QQType1.Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1264
				"QQType1.Inner2[TYPE_REF]{pkgstaticimport.QQType1.Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1265
				"QQType2.Inner1[TYPE_REF]{test0052.QQType2.Inner1, test0052, Ltest0052.QQType2$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1265
				"QQType2.Inner1[TYPE_REF]{test0052.QQType2.Inner1, test0052, Ltest0052.QQType2$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1266
				"QQType2.Inner3[TYPE_REF]{test0052.QQType2.Inner3, test0052, Ltest0052.QQType2$Inner3;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1266
				"QQType2.Inner3[TYPE_REF]{test0052.QQType2.Inner3, test0052, Ltest0052.QQType2$Inner3;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1267
				"QQType2.Inner7[TYPE_REF]{test0052.QQType2.Inner7, test0052, Ltest0052.QQType2$Inner7;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1267
				"QQType2.Inner7[TYPE_REF]{test0052.QQType2.Inner7, test0052, Ltest0052.QQType2$Inner7;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1268
				"QQType2.Inner2[TYPE_REF]{Inner2, test0052, Ltest0052.QQType2$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1268
				"QQType2.Inner2[TYPE_REF]{Inner2, test0052, Ltest0052.QQType2$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1269
				"QQType2.Inner4[TYPE_REF]{Inner4, test0052, Ltest0052.QQType2$Inner4;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1269
				"QQType2.Inner4[TYPE_REF]{Inner4, test0052, Ltest0052.QQType2$Inner4;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1270
				"QQType2.Inner8[TYPE_REF]{Inner8, test0052, Ltest0052.QQType2$Inner8;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1270
				"QQType2.Inner8[TYPE_REF]{Inner8, test0052, Ltest0052.QQType2$Inner8;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1271
				requestor.getResults());
1271
				requestor.getResults());
1272
	} finally {
1272
	} finally {
1273
		this.discardWorkingCopies(qqTypes);
1273
		this.discardWorkingCopies(qqTypes);
Lines 1307-1316 Link Here
1307
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1307
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1308
	
1308
	
1309
		assertResults(
1309
		assertResults(
1310
				"QQType1.Inner1[TYPE_REF]{Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1310
				"QQType1.Inner1[TYPE_REF]{Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1311
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1311
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1312
				"QQType1.Inner3[TYPE_REF]{Inner3, pkgstaticimport, Lpkgstaticimport.QQType1$Inner3;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1312
				"QQType1.Inner3[TYPE_REF]{Inner3, pkgstaticimport, Lpkgstaticimport.QQType1$Inner3;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1313
				"QQType1.Inner4[TYPE_REF]{Inner4, pkgstaticimport, Lpkgstaticimport.QQType1$Inner4;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1313
				"QQType1.Inner4[TYPE_REF]{Inner4, pkgstaticimport, Lpkgstaticimport.QQType1$Inner4;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1314
				requestor.getResults());
1314
				requestor.getResults());
1315
	} finally {
1315
	} finally {
1316
		this.discardWorkingCopies(qqTypes);
1316
		this.discardWorkingCopies(qqTypes);
Lines 1347-1354 Link Here
1347
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1347
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1348
	
1348
	
1349
		assertResults(
1349
		assertResults(
1350
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1350
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1351
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1351
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1352
				requestor.getResults());
1352
				requestor.getResults());
1353
	} finally {
1353
	} finally {
1354
		this.discardWorkingCopies(qqTypes);
1354
		this.discardWorkingCopies(qqTypes);
Lines 1386-1393 Link Here
1386
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1386
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1387
	
1387
	
1388
		assertResults(
1388
		assertResults(
1389
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1389
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1390
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1390
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1391
				requestor.getResults());
1391
				requestor.getResults());
1392
	} finally {
1392
	} finally {
1393
		this.discardWorkingCopies(qqTypes);
1393
		this.discardWorkingCopies(qqTypes);
Lines 1425-1432 Link Here
1425
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1425
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1426
	
1426
	
1427
		assertResults(
1427
		assertResults(
1428
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1428
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1429
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1429
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1430
				requestor.getResults());
1430
				requestor.getResults());
1431
	} finally {
1431
	} finally {
1432
		this.discardWorkingCopies(qqTypes);
1432
		this.discardWorkingCopies(qqTypes);
Lines 1463-1470 Link Here
1463
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1463
		this.wc.codeComplete(cursorLocation, requestor, this.wcOwner);
1464
	
1464
	
1465
		assertResults(
1465
		assertResults(
1466
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1466
				"QQType1.Inner1[TYPE_REF]{pkgstaticimport.QQType1.Inner1, pkgstaticimport, Lpkgstaticimport.QQType1$Inner1;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1467
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1467
				"QQType1.Inner2[TYPE_REF]{Inner2, pkgstaticimport, Lpkgstaticimport.QQType1$Inner2;, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1468
				requestor.getResults());
1468
				requestor.getResults());
1469
	} finally {
1469
	} finally {
1470
		this.discardWorkingCopies(qqTypes);
1470
		this.discardWorkingCopies(qqTypes);
Lines 1501-1507 Link Here
1501
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1501
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1502
1502
1503
		assertResults(
1503
		assertResults(
1504
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1504
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1505
				requestor.getResults());
1505
				requestor.getResults());
1506
	
1506
	
1507
	} finally {
1507
	} finally {
Lines 1555-1563 Link Here
1555
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1555
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1556
		
1556
		
1557
		assertResults(
1557
		assertResults(
1558
				"zzvarzz2[FIELD_REF]{zzvarzz2, Ltest0059.QQType5;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1558
				"zzvarzz2[FIELD_REF]{zzvarzz2, Ltest0059.QQType5;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1559
				"zzvarzz4[FIELD_REF]{zzvarzz4, Ltest0059.QQType5;, I, zzvarzz4, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1559
				"zzvarzz4[FIELD_REF]{zzvarzz4, Ltest0059.QQType5;, I, zzvarzz4, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1560
				"zzvarzz8[FIELD_REF]{zzvarzz8, Ltest0059.QQType5;, I, zzvarzz8, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1560
				"zzvarzz8[FIELD_REF]{zzvarzz8, Ltest0059.QQType5;, I, zzvarzz8, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1561
				requestor.getResults());
1561
				requestor.getResults());
1562
	} finally {
1562
	} finally {
1563
		this.discardWorkingCopies(qqTypes);
1563
		this.discardWorkingCopies(qqTypes);
Lines 1587-1596 Link Here
1587
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1587
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1588
	
1588
	
1589
		assertResults(
1589
		assertResults(
1590
				"zzvarzz1[FIELD_REF]{zzvarzz1, Lpkgstaticimport.QQType4;, I, zzvarzz1, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1590
				"zzvarzz1[FIELD_REF]{zzvarzz1, Lpkgstaticimport.QQType4;, I, zzvarzz1, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1591
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1591
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1592
				"zzvarzz3[FIELD_REF]{zzvarzz3, Lpkgstaticimport.QQType4;, I, zzvarzz3, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1592
				"zzvarzz3[FIELD_REF]{zzvarzz3, Lpkgstaticimport.QQType4;, I, zzvarzz3, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1593
				"zzvarzz4[FIELD_REF]{zzvarzz4, Lpkgstaticimport.QQType4;, I, zzvarzz4, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1593
				"zzvarzz4[FIELD_REF]{zzvarzz4, Lpkgstaticimport.QQType4;, I, zzvarzz4, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1594
				requestor.getResults());
1594
				requestor.getResults());
1595
	} finally {
1595
	} finally {
1596
		this.discardWorkingCopies(qqTypes);
1596
		this.discardWorkingCopies(qqTypes);
Lines 1627-1633 Link Here
1627
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1627
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1628
	
1628
	
1629
		assertResults(
1629
		assertResults(
1630
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1630
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1631
				requestor.getResults());
1631
				requestor.getResults());
1632
	} finally {
1632
	} finally {
1633
		this.discardWorkingCopies(qqTypes);
1633
		this.discardWorkingCopies(qqTypes);
Lines 1665-1671 Link Here
1665
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1665
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1666
	
1666
	
1667
		assertResults(
1667
		assertResults(
1668
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1668
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1669
				requestor.getResults());
1669
				requestor.getResults());
1670
	} finally {
1670
	} finally {
1671
		this.discardWorkingCopies(qqTypes);
1671
		this.discardWorkingCopies(qqTypes);
Lines 1703-1709 Link Here
1703
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1703
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1704
	
1704
	
1705
		assertResults(
1705
		assertResults(
1706
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1706
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1707
				requestor.getResults());
1707
				requestor.getResults());
1708
	} finally {
1708
	} finally {
1709
		this.discardWorkingCopies(qqTypes);
1709
		this.discardWorkingCopies(qqTypes);
Lines 1731-1737 Link Here
1731
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1731
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1732
	
1732
	
1733
		assertResults(
1733
		assertResults(
1734
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1734
				"zzvarzz2[FIELD_REF]{zzvarzz2, Lpkgstaticimport.QQType4;, I, zzvarzz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1735
				requestor.getResults());
1735
				requestor.getResults());
1736
	} finally {
1736
	} finally {
1737
		this.discardWorkingCopies(qqTypes);
1737
		this.discardWorkingCopies(qqTypes);
Lines 1768-1774 Link Here
1768
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1768
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1769
		
1769
		
1770
		assertResults(
1770
		assertResults(
1771
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Lpkgstaticimport.QQType7;, ()V, zzfoozz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1771
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Lpkgstaticimport.QQType7;, ()V, zzfoozz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1772
				requestor.getResults());
1772
				requestor.getResults());
1773
	} finally {
1773
	} finally {
1774
		this.discardWorkingCopies(qqTypes);
1774
		this.discardWorkingCopies(qqTypes);
Lines 1821-1829 Link Here
1821
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1821
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
1822
		
1822
		
1823
		assertResults(
1823
		assertResults(
1824
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Ltest0066.QQType8;, ()V, zzfoozz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1824
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Ltest0066.QQType8;, ()V, zzfoozz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1825
				"zzfoozz4[METHOD_REF]{zzfoozz4(), Ltest0066.QQType8;, ()V, zzfoozz4, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1825
				"zzfoozz4[METHOD_REF]{zzfoozz4(), Ltest0066.QQType8;, ()V, zzfoozz4, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1826
				"zzfoozz8[METHOD_REF]{zzfoozz8(), Ltest0066.QQType8;, ()V, zzfoozz8, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1826
				"zzfoozz8[METHOD_REF]{zzfoozz8(), Ltest0066.QQType8;, ()V, zzfoozz8, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1827
				requestor.getResults());
1827
				requestor.getResults());
1828
	} finally {
1828
	} finally {
1829
		this.discardWorkingCopies(qqTypes);
1829
		this.discardWorkingCopies(qqTypes);
Lines 1853-1862 Link Here
1853
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1853
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1854
	
1854
	
1855
		assertResults(
1855
		assertResults(
1856
				"zzfoozz1[METHOD_REF]{zzfoozz1(), Lpkgstaticimport.QQType7;, ()V, zzfoozz1, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1856
				"zzfoozz1[METHOD_REF]{zzfoozz1(), Lpkgstaticimport.QQType7;, ()V, zzfoozz1, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1857
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Lpkgstaticimport.QQType7;, ()V, zzfoozz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1857
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Lpkgstaticimport.QQType7;, ()V, zzfoozz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1858
				"zzfoozz3[METHOD_REF]{zzfoozz3(), Lpkgstaticimport.QQType7;, ()V, zzfoozz3, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1858
				"zzfoozz3[METHOD_REF]{zzfoozz3(), Lpkgstaticimport.QQType7;, ()V, zzfoozz3, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
1859
				"zzfoozz4[METHOD_REF]{zzfoozz4(), Lpkgstaticimport.QQType7;, ()V, zzfoozz4, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1859
				"zzfoozz4[METHOD_REF]{zzfoozz4(), Lpkgstaticimport.QQType7;, ()V, zzfoozz4, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1860
				requestor.getResults());
1860
				requestor.getResults());
1861
	} finally {
1861
	} finally {
1862
		this.discardWorkingCopies(qqTypes);
1862
		this.discardWorkingCopies(qqTypes);
Lines 1884-1890 Link Here
1884
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1884
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1885
	
1885
	
1886
		assertResults(
1886
		assertResults(
1887
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Lpkgstaticimport.QQType7;, ()V, zzfoozz2, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1887
				"zzfoozz2[METHOD_REF]{zzfoozz2(), Lpkgstaticimport.QQType7;, ()V, zzfoozz2, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
1888
				requestor.getResults());
1888
				requestor.getResults());
1889
	} finally {
1889
	} finally {
1890
		this.discardWorkingCopies(qqTypes);
1890
		this.discardWorkingCopies(qqTypes);
Lines 1905-1911 Link Here
1905
	cu.codeComplete(cursorLocation, requestor);
1905
	cu.codeComplete(cursorLocation, requestor);
1906
1906
1907
	assertResults(
1907
	assertResults(
1908
			"putValue[METHOD_REF]{putValue(), Ltest0069.Test<Ljava.lang.String;>;, (Ljava.lang.String;)V, putValue, (value), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
1908
			"putValue[METHOD_REF]{putValue(), Ltest0069.Test<Ljava.lang.String;>;, (Ljava.lang.String;)V, putValue, (value), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
1909
			requestor.getResults());
1909
			requestor.getResults());
1910
}
1910
}
1911
/*
1911
/*
Lines 1931-1938 Link Here
1931
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1931
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
1932
	
1932
	
1933
		assertResults(
1933
		assertResults(
1934
				"test0070.p[PACKAGE_REF]{test0070.p., test0070.p, null, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1934
				"test0070.p[PACKAGE_REF]{test0070.p., test0070.p, null, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
1935
				"test0070[PACKAGE_REF]{test0070., test0070, null, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
1935
				"test0070[PACKAGE_REF]{test0070., test0070, null, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
1936
				requestor.getResults());
1936
				requestor.getResults());
1937
	} finally {
1937
	} finally {
1938
		if(importedClass != null) {
1938
		if(importedClass != null) {
Lines 1973-1979 Link Here
1973
	            result.context);
1973
	            result.context);
1974
	
1974
	
1975
		assertResults(
1975
		assertResults(
1976
				"ImportedClass[TYPE_REF]{test0071.p.ImportedClass., test0071.p, Ltest0071.p.ImportedClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1976
				"ImportedClass[TYPE_REF]{test0071.p.ImportedClass., test0071.p, Ltest0071.p.ImportedClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
1977
				result.proposals);
1977
				result.proposals);
1978
	} finally {
1978
	} finally {
1979
		if(importedClass != null) {
1979
		if(importedClass != null) {
Lines 2006-2014 Link Here
2006
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
2006
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
2007
	
2007
	
2008
		assertResults(
2008
		assertResults(
2009
				"ZZZ1[FIELD_REF]{test0072.p.ImportedClass.ZZZ1;, Ltest0072.p.ImportedClass;, I, ZZZ1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2009
				"ZZZ1[FIELD_REF]{test0072.p.ImportedClass.ZZZ1;, Ltest0072.p.ImportedClass;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2010
				"ZZZ2[METHOD_IMPORT]{test0072.p.ImportedClass.ZZZ2;, Ltest0072.p.ImportedClass;, ()V, ZZZ2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2010
				"ZZZ2[METHOD_IMPORT]{test0072.p.ImportedClass.ZZZ2;, Ltest0072.p.ImportedClass;, ()V, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2011
				"ZZZ2[METHOD_IMPORT]{test0072.p.ImportedClass.ZZZ2;, Ltest0072.p.ImportedClass;, (I)V, ZZZ2, (i), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2011
				"ZZZ2[METHOD_IMPORT]{test0072.p.ImportedClass.ZZZ2;, Ltest0072.p.ImportedClass;, (I)V, ZZZ2, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2012
				requestor.getResults());
2012
				requestor.getResults());
2013
	} finally {
2013
	} finally {
2014
		if(importedClass != null) {
2014
		if(importedClass != null) {
Lines 2043-2051 Link Here
2043
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
2043
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
2044
	
2044
	
2045
		assertResults(
2045
		assertResults(
2046
				"ZZZ1[FIELD_REF]{test0073.p.ImportedClass.Inner.ZZZ1;, Ltest0073.p.ImportedClass$Inner;, I, ZZZ1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2046
				"ZZZ1[FIELD_REF]{test0073.p.ImportedClass.Inner.ZZZ1;, Ltest0073.p.ImportedClass$Inner;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2047
				"ZZZ2[METHOD_IMPORT]{test0073.p.ImportedClass.Inner.ZZZ2;, Ltest0073.p.ImportedClass$Inner;, ()V, ZZZ2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2047
				"ZZZ2[METHOD_IMPORT]{test0073.p.ImportedClass.Inner.ZZZ2;, Ltest0073.p.ImportedClass$Inner;, ()V, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2048
				"ZZZ2[METHOD_IMPORT]{test0073.p.ImportedClass.Inner.ZZZ2;, Ltest0073.p.ImportedClass$Inner;, (I)V, ZZZ2, (i), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2048
				"ZZZ2[METHOD_IMPORT]{test0073.p.ImportedClass.Inner.ZZZ2;, Ltest0073.p.ImportedClass$Inner;, (I)V, ZZZ2, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2049
				requestor.getResults());
2049
				requestor.getResults());
2050
	} finally {
2050
	} finally {
2051
		if(importedClass != null) {
2051
		if(importedClass != null) {
Lines 2080-2088 Link Here
2080
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
2080
		cu.codeComplete(cursorLocation, requestor, this.wcOwner);
2081
	
2081
	
2082
		assertResults(
2082
		assertResults(
2083
				"ZZZ1[FIELD_REF]{test0074.p.ImportedClass.Inner.ZZZ1;, Ltest0074.p.ImportedClass$Inner;, I, ZZZ1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2083
				"ZZZ1[FIELD_REF]{test0074.p.ImportedClass.Inner.ZZZ1;, Ltest0074.p.ImportedClass$Inner;, I, ZZZ1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2084
				"ZZZ2[METHOD_IMPORT]{test0074.p.ImportedClass.Inner.ZZZ2;, Ltest0074.p.ImportedClass$Inner;, ()V, ZZZ2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2084
				"ZZZ2[METHOD_IMPORT]{test0074.p.ImportedClass.Inner.ZZZ2;, Ltest0074.p.ImportedClass$Inner;, ()V, ZZZ2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
2085
				"ZZZ2[METHOD_IMPORT]{test0074.p.ImportedClass.Inner.ZZZ2;, Ltest0074.p.ImportedClass$Inner;, (I)V, ZZZ2, (i), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2085
				"ZZZ2[METHOD_IMPORT]{test0074.p.ImportedClass.Inner.ZZZ2;, Ltest0074.p.ImportedClass$Inner;, (I)V, ZZZ2, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
2086
				requestor.getResults());
2086
				requestor.getResults());
2087
	} finally {
2087
	} finally {
2088
		if(importedClass != null) {
2088
		if(importedClass != null) {
Lines 2111-2117 Link Here
2111
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2111
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2112
2112
2113
	assertResults(
2113
	assertResults(
2114
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2114
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2115
			requestor.getResults());
2115
			requestor.getResults());
2116
}
2116
}
2117
public void test0076() throws JavaModelException {	
2117
public void test0076() throws JavaModelException {	
Lines 2135-2141 Link Here
2135
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2135
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2136
2136
2137
	assertResults(
2137
	assertResults(
2138
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2138
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2139
			requestor.getResults());
2139
			requestor.getResults());
2140
}
2140
}
2141
public void test0077() throws JavaModelException {
2141
public void test0077() throws JavaModelException {
Lines 2160-2166 Link Here
2160
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2160
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2161
2161
2162
	assertResults(
2162
	assertResults(
2163
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2163
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2164
			requestor.getResults());
2164
			requestor.getResults());
2165
}
2165
}
2166
public void test0078() throws JavaModelException {
2166
public void test0078() throws JavaModelException {
Lines 2186-2192 Link Here
2186
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2186
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2187
2187
2188
	assertResults(
2188
	assertResults(
2189
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2189
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2190
			requestor.getResults());
2190
			requestor.getResults());
2191
}
2191
}
2192
public void test0079() throws JavaModelException {
2192
public void test0079() throws JavaModelException {
Lines 2211-2217 Link Here
2211
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2211
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2212
2212
2213
	assertResults(
2213
	assertResults(
2214
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2214
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2215
			requestor.getResults());
2215
			requestor.getResults());
2216
}
2216
}
2217
public void test0080() throws JavaModelException {
2217
public void test0080() throws JavaModelException {
Lines 2236-2242 Link Here
2236
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2236
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2237
2237
2238
	assertResults(
2238
	assertResults(
2239
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2239
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2240
			requestor.getResults());
2240
			requestor.getResults());
2241
}
2241
}
2242
public void test0081() throws JavaModelException {
2242
public void test0081() throws JavaModelException {
Lines 2261-2267 Link Here
2261
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2261
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2262
2262
2263
	assertResults(
2263
	assertResults(
2264
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2264
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2265
			requestor.getResults());
2265
			requestor.getResults());
2266
}
2266
}
2267
public void test0082() throws JavaModelException {
2267
public void test0082() throws JavaModelException {
Lines 2287-2293 Link Here
2287
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2287
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2288
2288
2289
	assertResults(
2289
	assertResults(
2290
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2290
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2291
			requestor.getResults());
2291
			requestor.getResults());
2292
}
2292
}
2293
public void test0083() throws JavaModelException {
2293
public void test0083() throws JavaModelException {
Lines 2313-2319 Link Here
2313
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2313
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
2314
2314
2315
	assertResults(
2315
	assertResults(
2316
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2316
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
2317
			requestor.getResults());
2317
			requestor.getResults());
2318
}
2318
}
2319
public void test0084() throws JavaModelException {
2319
public void test0084() throws JavaModelException {
Lines 2339-2346 Link Here
2339
				"foo");
2339
				"foo");
2340
		
2340
		
2341
		assertResults(
2341
		assertResults(
2342
				"foo[METHOD_REF]{foo(), Lpkgstaticimport.MyClass0084;, ()I, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
2342
				"foo[METHOD_REF]{foo(), Lpkgstaticimport.MyClass0084;, ()I, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
2343
				"foo[METHOD_REF]{foo(), Lpkgstaticimport.MyClass0084;, (I)I, foo, (i), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2343
				"foo[METHOD_REF]{foo(), Lpkgstaticimport.MyClass0084;, (I)I, foo, (i), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
2344
				result.proposals);
2344
				result.proposals);
2345
	} finally {
2345
	} finally {
2346
		if(imported != null) {
2346
		if(imported != null) {
Lines 2367-2373 Link Here
2367
	this.wc.codeComplete(cursorLocation, requestor);
2367
	this.wc.codeComplete(cursorLocation, requestor);
2368
2368
2369
	assertResults(
2369
	assertResults(
2370
			"TestAnnotation[TYPE_REF]{TestAnnotation, test0085, Ltest0085.TestAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2370
			"TestAnnotation[TYPE_REF]{TestAnnotation, test0085, Ltest0085.TestAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2371
			requestor.getResults());
2371
			requestor.getResults());
2372
}
2372
}
2373
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=85290
2373
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=85290
Lines 2388-2394 Link Here
2388
	this.wc.codeComplete(cursorLocation, requestor);
2388
	this.wc.codeComplete(cursorLocation, requestor);
2389
2389
2390
	assertResults(
2390
	assertResults(
2391
			"TestAnnotation[TYPE_REF]{TestAnnotation, , LTestAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2391
			"TestAnnotation[TYPE_REF]{TestAnnotation, , LTestAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2392
			requestor.getResults());
2392
			requestor.getResults());
2393
}
2393
}
2394
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=85402
2394
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=85402
Lines 2415-2421 Link Here
2415
				requestor.getResults());
2415
				requestor.getResults());
2416
	} else {
2416
	} else {
2417
		assertResults(
2417
		assertResults(
2418
				"TestAnnotation[TYPE_REF]{TestAnnotation, test0087, Ltest0087.TestAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2418
				"TestAnnotation[TYPE_REF]{TestAnnotation, test0087, Ltest0087.TestAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2419
				requestor.getResults());
2419
				requestor.getResults());
2420
	}
2420
	}
2421
}
2421
}
Lines 2438-2444 Link Here
2438
	this.wc.codeComplete(cursorLocation, requestor);
2438
	this.wc.codeComplete(cursorLocation, requestor);
2439
2439
2440
	assertResults(
2440
	assertResults(
2441
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0088.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2441
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0088.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2442
			requestor.getResults());
2442
			requestor.getResults());
2443
}
2443
}
2444
public void test0089() throws JavaModelException {
2444
public void test0089() throws JavaModelException {
Lines 2461-2467 Link Here
2461
	this.wc.codeComplete(cursorLocation, requestor);
2461
	this.wc.codeComplete(cursorLocation, requestor);
2462
2462
2463
	assertResults(
2463
	assertResults(
2464
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0089.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2464
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0089.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2465
			requestor.getResults());
2465
			requestor.getResults());
2466
}
2466
}
2467
public void test0090() throws JavaModelException {
2467
public void test0090() throws JavaModelException {
Lines 2484-2490 Link Here
2484
	this.wc.codeComplete(cursorLocation, requestor);
2484
	this.wc.codeComplete(cursorLocation, requestor);
2485
2485
2486
	assertResults(
2486
	assertResults(
2487
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0090.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2487
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0090.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2488
			requestor.getResults());
2488
			requestor.getResults());
2489
}
2489
}
2490
public void test0091() throws JavaModelException {
2490
public void test0091() throws JavaModelException {
Lines 2509-2515 Link Here
2509
	this.wc.codeComplete(cursorLocation, requestor);
2509
	this.wc.codeComplete(cursorLocation, requestor);
2510
2510
2511
	assertResults(
2511
	assertResults(
2512
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0091.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2512
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0091.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2513
			requestor.getResults());
2513
			requestor.getResults());
2514
}
2514
}
2515
public void test0092() throws JavaModelException {
2515
public void test0092() throws JavaModelException {
Lines 2532-2538 Link Here
2532
	this.wc.codeComplete(cursorLocation, requestor);
2532
	this.wc.codeComplete(cursorLocation, requestor);
2533
2533
2534
	assertResults(
2534
	assertResults(
2535
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0092.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2535
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0092.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2536
			requestor.getResults());
2536
			requestor.getResults());
2537
}
2537
}
2538
public void test0093() throws JavaModelException {
2538
public void test0093() throws JavaModelException {
Lines 2556-2562 Link Here
2556
	this.wc.codeComplete(cursorLocation, requestor);
2556
	this.wc.codeComplete(cursorLocation, requestor);
2557
2557
2558
	assertResults(
2558
	assertResults(
2559
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0093.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2559
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0093.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2560
			requestor.getResults());
2560
			requestor.getResults());
2561
}
2561
}
2562
public void test0094() throws JavaModelException {
2562
public void test0094() throws JavaModelException {
Lines 2578-2584 Link Here
2578
	this.wc.codeComplete(cursorLocation, requestor);
2578
	this.wc.codeComplete(cursorLocation, requestor);
2579
2579
2580
	assertResults(
2580
	assertResults(
2581
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0094.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2581
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0094.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2582
			requestor.getResults());
2582
			requestor.getResults());
2583
}
2583
}
2584
public void test0095() throws JavaModelException {
2584
public void test0095() throws JavaModelException {
Lines 2601-2607 Link Here
2601
	this.wc.codeComplete(cursorLocation, requestor);
2601
	this.wc.codeComplete(cursorLocation, requestor);
2602
2602
2603
	assertResults(
2603
	assertResults(
2604
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0095.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2604
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0095.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2605
			requestor.getResults());
2605
			requestor.getResults());
2606
}
2606
}
2607
public void test0096() throws JavaModelException {
2607
public void test0096() throws JavaModelException {
Lines 2624-2630 Link Here
2624
	this.wc.codeComplete(cursorLocation, requestor);
2624
	this.wc.codeComplete(cursorLocation, requestor);
2625
2625
2626
	assertResults(
2626
	assertResults(
2627
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0096.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2627
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0096.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2628
			requestor.getResults());
2628
			requestor.getResults());
2629
}
2629
}
2630
public void test0097() throws JavaModelException {
2630
public void test0097() throws JavaModelException {
Lines 2649-2655 Link Here
2649
	this.wc.codeComplete(cursorLocation, requestor);
2649
	this.wc.codeComplete(cursorLocation, requestor);
2650
2650
2651
	assertResults(
2651
	assertResults(
2652
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0097.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2652
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0097.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2653
			requestor.getResults());
2653
			requestor.getResults());
2654
}
2654
}
2655
public void test0098() throws JavaModelException {
2655
public void test0098() throws JavaModelException {
Lines 2672-2678 Link Here
2672
	this.wc.codeComplete(cursorLocation, requestor);
2672
	this.wc.codeComplete(cursorLocation, requestor);
2673
2673
2674
	assertResults(
2674
	assertResults(
2675
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0098.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2675
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0098.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2676
			requestor.getResults());
2676
			requestor.getResults());
2677
}
2677
}
2678
public void test0099() throws JavaModelException {
2678
public void test0099() throws JavaModelException {
Lines 2696-2702 Link Here
2696
	this.wc.codeComplete(cursorLocation, requestor);
2696
	this.wc.codeComplete(cursorLocation, requestor);
2697
2697
2698
	assertResults(
2698
	assertResults(
2699
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0099.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2699
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0099.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2700
			requestor.getResults());
2700
			requestor.getResults());
2701
}
2701
}
2702
public void test0100() throws JavaModelException {
2702
public void test0100() throws JavaModelException {
Lines 2718-2724 Link Here
2718
	this.wc.codeComplete(cursorLocation, requestor);
2718
	this.wc.codeComplete(cursorLocation, requestor);
2719
2719
2720
	assertResults(
2720
	assertResults(
2721
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0100.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2721
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0100.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2722
			requestor.getResults());
2722
			requestor.getResults());
2723
}
2723
}
2724
public void test0101() throws JavaModelException {
2724
public void test0101() throws JavaModelException {
Lines 2741-2747 Link Here
2741
	this.wc.codeComplete(cursorLocation, requestor);
2741
	this.wc.codeComplete(cursorLocation, requestor);
2742
2742
2743
	assertResults(
2743
	assertResults(
2744
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0101.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2744
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0101.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2745
			requestor.getResults());
2745
			requestor.getResults());
2746
}
2746
}
2747
public void test0102() throws JavaModelException {
2747
public void test0102() throws JavaModelException {
Lines 2764-2770 Link Here
2764
	this.wc.codeComplete(cursorLocation, requestor);
2764
	this.wc.codeComplete(cursorLocation, requestor);
2765
2765
2766
	assertResults(
2766
	assertResults(
2767
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0102.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2767
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0102.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2768
			requestor.getResults());
2768
			requestor.getResults());
2769
}
2769
}
2770
public void test0103() throws JavaModelException {
2770
public void test0103() throws JavaModelException {
Lines 2789-2795 Link Here
2789
	this.wc.codeComplete(cursorLocation, requestor);
2789
	this.wc.codeComplete(cursorLocation, requestor);
2790
2790
2791
	assertResults(
2791
	assertResults(
2792
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0103.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2792
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0103.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2793
			requestor.getResults());
2793
			requestor.getResults());
2794
}
2794
}
2795
public void test0104() throws JavaModelException {
2795
public void test0104() throws JavaModelException {
Lines 2812-2818 Link Here
2812
	this.wc.codeComplete(cursorLocation, requestor);
2812
	this.wc.codeComplete(cursorLocation, requestor);
2813
2813
2814
	assertResults(
2814
	assertResults(
2815
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0104.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2815
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0104.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2816
			requestor.getResults());
2816
			requestor.getResults());
2817
}
2817
}
2818
public void test0105() throws JavaModelException {
2818
public void test0105() throws JavaModelException {
Lines 2836-2842 Link Here
2836
	this.wc.codeComplete(cursorLocation, requestor);
2836
	this.wc.codeComplete(cursorLocation, requestor);
2837
2837
2838
	assertResults(
2838
	assertResults(
2839
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0105.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2839
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0105.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2840
			requestor.getResults());
2840
			requestor.getResults());
2841
}
2841
}
2842
public void test0106() throws JavaModelException {
2842
public void test0106() throws JavaModelException {
Lines 2858-2864 Link Here
2858
	this.wc.codeComplete(cursorLocation, requestor);
2858
	this.wc.codeComplete(cursorLocation, requestor);
2859
2859
2860
	assertResults(
2860
	assertResults(
2861
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0106.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2861
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0106.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2862
			requestor.getResults());
2862
			requestor.getResults());
2863
}
2863
}
2864
public void test0107() throws JavaModelException {
2864
public void test0107() throws JavaModelException {
Lines 2881-2887 Link Here
2881
	this.wc.codeComplete(cursorLocation, requestor);
2881
	this.wc.codeComplete(cursorLocation, requestor);
2882
2882
2883
	assertResults(
2883
	assertResults(
2884
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0107.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2884
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0107.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2885
			requestor.getResults());
2885
			requestor.getResults());
2886
}
2886
}
2887
public void test0108() throws JavaModelException {
2887
public void test0108() throws JavaModelException {
Lines 2904-2910 Link Here
2904
	this.wc.codeComplete(cursorLocation, requestor);
2904
	this.wc.codeComplete(cursorLocation, requestor);
2905
2905
2906
	assertResults(
2906
	assertResults(
2907
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0108.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2907
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0108.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2908
			requestor.getResults());
2908
			requestor.getResults());
2909
}
2909
}
2910
public void test0109() throws JavaModelException {
2910
public void test0109() throws JavaModelException {
Lines 2929-2935 Link Here
2929
	this.wc.codeComplete(cursorLocation, requestor);
2929
	this.wc.codeComplete(cursorLocation, requestor);
2930
2930
2931
	assertResults(
2931
	assertResults(
2932
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0109.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2932
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0109.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2933
			requestor.getResults());
2933
			requestor.getResults());
2934
}
2934
}
2935
public void test0110() throws JavaModelException {
2935
public void test0110() throws JavaModelException {
Lines 2952-2958 Link Here
2952
	this.wc.codeComplete(cursorLocation, requestor);
2952
	this.wc.codeComplete(cursorLocation, requestor);
2953
2953
2954
	assertResults(
2954
	assertResults(
2955
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0110.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2955
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0110.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2956
			requestor.getResults());
2956
			requestor.getResults());
2957
}
2957
}
2958
public void test0111() throws JavaModelException {
2958
public void test0111() throws JavaModelException {
Lines 2976-2982 Link Here
2976
	this.wc.codeComplete(cursorLocation, requestor);
2976
	this.wc.codeComplete(cursorLocation, requestor);
2977
2977
2978
	assertResults(
2978
	assertResults(
2979
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0111.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2979
			"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0111.TestAnnotation;, Ljava.lang.String;, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
2980
			requestor.getResults());
2980
			requestor.getResults());
2981
}
2981
}
2982
public void test0112() throws JavaModelException {
2982
public void test0112() throws JavaModelException {
Lines 2999-3005 Link Here
2999
	this.wc.codeComplete(cursorLocation, requestor);
2999
	this.wc.codeComplete(cursorLocation, requestor);
3000
3000
3001
	assertResults(
3001
	assertResults(
3002
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0112.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3002
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0112.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3003
			requestor.getResults());
3003
			requestor.getResults());
3004
}
3004
}
3005
public void test0113() throws JavaModelException {
3005
public void test0113() throws JavaModelException {
Lines 3023-3029 Link Here
3023
	this.wc.codeComplete(cursorLocation, requestor);
3023
	this.wc.codeComplete(cursorLocation, requestor);
3024
3024
3025
	assertResults(
3025
	assertResults(
3026
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0113.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3026
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0113.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3027
			requestor.getResults());
3027
			requestor.getResults());
3028
}
3028
}
3029
public void test0114() throws JavaModelException {
3029
public void test0114() throws JavaModelException {
Lines 3047-3053 Link Here
3047
	this.wc.codeComplete(cursorLocation, requestor);
3047
	this.wc.codeComplete(cursorLocation, requestor);
3048
3048
3049
	assertResults(
3049
	assertResults(
3050
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0114.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3050
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0114.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3051
			requestor.getResults());
3051
			requestor.getResults());
3052
}
3052
}
3053
public void test0115() throws JavaModelException {
3053
public void test0115() throws JavaModelException {
Lines 3073-3079 Link Here
3073
	this.wc.codeComplete(cursorLocation, requestor);
3073
	this.wc.codeComplete(cursorLocation, requestor);
3074
3074
3075
	assertResults(
3075
	assertResults(
3076
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0115.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3076
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0115.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3077
			requestor.getResults());
3077
			requestor.getResults());
3078
}
3078
}
3079
public void test0116() throws JavaModelException {
3079
public void test0116() throws JavaModelException {
Lines 3097-3103 Link Here
3097
	this.wc.codeComplete(cursorLocation, requestor);
3097
	this.wc.codeComplete(cursorLocation, requestor);
3098
3098
3099
	assertResults(
3099
	assertResults(
3100
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0116.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3100
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0116.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3101
			requestor.getResults());
3101
			requestor.getResults());
3102
}
3102
}
3103
public void test0117() throws JavaModelException {
3103
public void test0117() throws JavaModelException {
Lines 3122-3128 Link Here
3122
	this.wc.codeComplete(cursorLocation, requestor);
3122
	this.wc.codeComplete(cursorLocation, requestor);
3123
3123
3124
	assertResults(
3124
	assertResults(
3125
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0117.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3125
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0117.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3126
			requestor.getResults());
3126
			requestor.getResults());
3127
}
3127
}
3128
public void test0118() throws JavaModelException {
3128
public void test0118() throws JavaModelException {
Lines 3145-3151 Link Here
3145
	this.wc.codeComplete(cursorLocation, requestor);
3145
	this.wc.codeComplete(cursorLocation, requestor);
3146
3146
3147
	assertResults(
3147
	assertResults(
3148
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0118.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3148
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0118.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3149
			requestor.getResults());
3149
			requestor.getResults());
3150
}
3150
}
3151
public void test0119() throws JavaModelException {
3151
public void test0119() throws JavaModelException {
Lines 3169-3175 Link Here
3169
	this.wc.codeComplete(cursorLocation, requestor);
3169
	this.wc.codeComplete(cursorLocation, requestor);
3170
3170
3171
	assertResults(
3171
	assertResults(
3172
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0119.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3172
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0119.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3173
			requestor.getResults());
3173
			requestor.getResults());
3174
}
3174
}
3175
public void test0120() throws JavaModelException {
3175
public void test0120() throws JavaModelException {
Lines 3193-3199 Link Here
3193
	this.wc.codeComplete(cursorLocation, requestor);
3193
	this.wc.codeComplete(cursorLocation, requestor);
3194
3194
3195
	assertResults(
3195
	assertResults(
3196
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0120.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3196
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0120.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3197
			requestor.getResults());
3197
			requestor.getResults());
3198
}
3198
}
3199
public void test0121() throws JavaModelException {
3199
public void test0121() throws JavaModelException {
Lines 3219-3225 Link Here
3219
	this.wc.codeComplete(cursorLocation, requestor);
3219
	this.wc.codeComplete(cursorLocation, requestor);
3220
3220
3221
	assertResults(
3221
	assertResults(
3222
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0121.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3222
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0121.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3223
			requestor.getResults());
3223
			requestor.getResults());
3224
}
3224
}
3225
public void test0122() throws JavaModelException {
3225
public void test0122() throws JavaModelException {
Lines 3243-3249 Link Here
3243
	this.wc.codeComplete(cursorLocation, requestor);
3243
	this.wc.codeComplete(cursorLocation, requestor);
3244
3244
3245
	assertResults(
3245
	assertResults(
3246
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0122.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3246
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0122.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3247
			requestor.getResults());
3247
			requestor.getResults());
3248
}
3248
}
3249
public void test0123() throws JavaModelException {
3249
public void test0123() throws JavaModelException {
Lines 3268-3274 Link Here
3268
	this.wc.codeComplete(cursorLocation, requestor);
3268
	this.wc.codeComplete(cursorLocation, requestor);
3269
3269
3270
	assertResults(
3270
	assertResults(
3271
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0123.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3271
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0123.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3272
			requestor.getResults());
3272
			requestor.getResults());
3273
}
3273
}
3274
public void test0124() throws JavaModelException {
3274
public void test0124() throws JavaModelException {
Lines 3291-3297 Link Here
3291
	this.wc.codeComplete(cursorLocation, requestor);
3291
	this.wc.codeComplete(cursorLocation, requestor);
3292
3292
3293
	assertResults(
3293
	assertResults(
3294
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0124.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3294
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0124.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3295
			requestor.getResults());
3295
			requestor.getResults());
3296
}
3296
}
3297
public void test0125() throws JavaModelException {
3297
public void test0125() throws JavaModelException {
Lines 3315-3321 Link Here
3315
	this.wc.codeComplete(cursorLocation, requestor);
3315
	this.wc.codeComplete(cursorLocation, requestor);
3316
3316
3317
	assertResults(
3317
	assertResults(
3318
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0125.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3318
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0125.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3319
			requestor.getResults());
3319
			requestor.getResults());
3320
}
3320
}
3321
public void test0126() throws JavaModelException {
3321
public void test0126() throws JavaModelException {
Lines 3339-3345 Link Here
3339
	this.wc.codeComplete(cursorLocation, requestor);
3339
	this.wc.codeComplete(cursorLocation, requestor);
3340
3340
3341
	assertResults(
3341
	assertResults(
3342
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0126.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3342
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0126.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3343
			requestor.getResults());
3343
			requestor.getResults());
3344
}
3344
}
3345
public void test0127() throws JavaModelException {
3345
public void test0127() throws JavaModelException {
Lines 3365-3371 Link Here
3365
	this.wc.codeComplete(cursorLocation, requestor);
3365
	this.wc.codeComplete(cursorLocation, requestor);
3366
3366
3367
	assertResults(
3367
	assertResults(
3368
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0127.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3368
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0127.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3369
			requestor.getResults());
3369
			requestor.getResults());
3370
}
3370
}
3371
public void test0128() throws JavaModelException {
3371
public void test0128() throws JavaModelException {
Lines 3389-3395 Link Here
3389
	this.wc.codeComplete(cursorLocation, requestor);
3389
	this.wc.codeComplete(cursorLocation, requestor);
3390
3390
3391
	assertResults(
3391
	assertResults(
3392
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0128.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3392
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0128.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3393
			requestor.getResults());
3393
			requestor.getResults());
3394
}
3394
}
3395
public void test0129() throws JavaModelException {
3395
public void test0129() throws JavaModelException {
Lines 3414-3420 Link Here
3414
	this.wc.codeComplete(cursorLocation, requestor);
3414
	this.wc.codeComplete(cursorLocation, requestor);
3415
3415
3416
	assertResults(
3416
	assertResults(
3417
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0129.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3417
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0129.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3418
			requestor.getResults());
3418
			requestor.getResults());
3419
}
3419
}
3420
public void test0130() throws JavaModelException {
3420
public void test0130() throws JavaModelException {
Lines 3437-3443 Link Here
3437
	this.wc.codeComplete(cursorLocation, requestor);
3437
	this.wc.codeComplete(cursorLocation, requestor);
3438
3438
3439
	assertResults(
3439
	assertResults(
3440
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0130.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3440
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0130.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3441
			requestor.getResults());
3441
			requestor.getResults());
3442
}
3442
}
3443
public void test0131() throws JavaModelException {
3443
public void test0131() throws JavaModelException {
Lines 3461-3467 Link Here
3461
	this.wc.codeComplete(cursorLocation, requestor);
3461
	this.wc.codeComplete(cursorLocation, requestor);
3462
3462
3463
	assertResults(
3463
	assertResults(
3464
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0131.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3464
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0131.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3465
			requestor.getResults());
3465
			requestor.getResults());
3466
}
3466
}
3467
public void test0132() throws JavaModelException {
3467
public void test0132() throws JavaModelException {
Lines 3485-3491 Link Here
3485
	this.wc.codeComplete(cursorLocation, requestor);
3485
	this.wc.codeComplete(cursorLocation, requestor);
3486
3486
3487
	assertResults(
3487
	assertResults(
3488
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0132.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3488
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0132.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3489
			requestor.getResults());
3489
			requestor.getResults());
3490
}
3490
}
3491
public void test0133() throws JavaModelException {
3491
public void test0133() throws JavaModelException {
Lines 3511-3517 Link Here
3511
	this.wc.codeComplete(cursorLocation, requestor);
3511
	this.wc.codeComplete(cursorLocation, requestor);
3512
3512
3513
	assertResults(
3513
	assertResults(
3514
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0133.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3514
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0133.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3515
			requestor.getResults());
3515
			requestor.getResults());
3516
}
3516
}
3517
public void test0134() throws JavaModelException {
3517
public void test0134() throws JavaModelException {
Lines 3535-3541 Link Here
3535
	this.wc.codeComplete(cursorLocation, requestor);
3535
	this.wc.codeComplete(cursorLocation, requestor);
3536
3536
3537
	assertResults(
3537
	assertResults(
3538
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0134.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3538
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0134.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3539
			requestor.getResults());
3539
			requestor.getResults());
3540
}
3540
}
3541
public void test0135() throws JavaModelException {
3541
public void test0135() throws JavaModelException {
Lines 3554-3560 Link Here
3554
			"foo");
3554
			"foo");
3555
	
3555
	
3556
	assertResults(
3556
	assertResults(
3557
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0135.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3557
			"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0135.TestAnnotation;, Ljava.lang.String;, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED + R_UNQUALIFIED) + "}",
3558
			result.proposals);
3558
			result.proposals);
3559
}
3559
}
3560
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=84554
3560
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=84554
Lines 3906-3912 Link Here
3906
				result.context);
3906
				result.context);
3907
		
3907
		
3908
		assertResults(
3908
		assertResults(
3909
				"X.Y[TYPE_REF]{Y, test0144, Ltest0144.X$Y;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) + "}",
3909
				"X.Y[TYPE_REF]{Y, test0144, Ltest0144.X$Y;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) + "}",
3910
				result.proposals);
3910
				result.proposals);
3911
	} finally {
3911
	} finally {
3912
		if(aClass != null) {
3912
		if(aClass != null) {
Lines 3949-3956 Link Here
3949
				result.context);
3949
				result.context);
3950
		
3950
		
3951
		assertResults(
3951
		assertResults(
3952
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0145, Ltest0145.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3952
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0145, Ltest0145.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3953
				"ZZClass[TYPE_REF]{ZZClass, test0145, Ltest0145.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3953
				"ZZClass[TYPE_REF]{ZZClass, test0145, Ltest0145.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3954
				result.proposals);
3954
				result.proposals);
3955
	} finally {
3955
	} finally {
3956
		if(anAnnotation != null) {
3956
		if(anAnnotation != null) {
Lines 3995-4002 Link Here
3995
				result.context);
3995
				result.context);
3996
		
3996
		
3997
		assertResults(
3997
		assertResults(
3998
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0146, Ltest0146.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3998
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0146, Ltest0146.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
3999
				"ZZClass[TYPE_REF]{ZZClass, test0146, Ltest0146.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
3999
				"ZZClass[TYPE_REF]{ZZClass, test0146, Ltest0146.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4000
				result.proposals);
4000
				result.proposals);
4001
	} finally {
4001
	} finally {
4002
		if(anAnnotation != null) {
4002
		if(anAnnotation != null) {
Lines 4041-4048 Link Here
4041
				result.context);
4041
				result.context);
4042
		
4042
		
4043
		assertResults(
4043
		assertResults(
4044
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0147, Ltest0147.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4044
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0147, Ltest0147.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4045
				"ZZClass[TYPE_REF]{ZZClass, test0147, Ltest0147.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4045
				"ZZClass[TYPE_REF]{ZZClass, test0147, Ltest0147.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4046
				result.proposals);
4046
				result.proposals);
4047
	} finally {
4047
	} finally {
4048
		if(anAnnotation != null) {
4048
		if(anAnnotation != null) {
Lines 4087-4094 Link Here
4087
				result.context);
4087
				result.context);
4088
		
4088
		
4089
		assertResults(
4089
		assertResults(
4090
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0148, Ltest0148.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4090
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0148, Ltest0148.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4091
				"ZZClass[TYPE_REF]{ZZClass, test0148, Ltest0148.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4091
				"ZZClass[TYPE_REF]{ZZClass, test0148, Ltest0148.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4092
				result.proposals);
4092
				result.proposals);
4093
	} finally {
4093
	} finally {
4094
		if(anAnnotation != null) {
4094
		if(anAnnotation != null) {
Lines 4133-4140 Link Here
4133
				result.context);
4133
				result.context);
4134
		
4134
		
4135
		assertResults(
4135
		assertResults(
4136
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0149, Ltest0149.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4136
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0149, Ltest0149.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4137
				"ZZClass[TYPE_REF]{ZZClass, test0149, Ltest0149.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4137
				"ZZClass[TYPE_REF]{ZZClass, test0149, Ltest0149.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4138
				result.proposals);
4138
				result.proposals);
4139
	} finally {
4139
	} finally {
4140
		if(anAnnotation != null) {
4140
		if(anAnnotation != null) {
Lines 4179-4186 Link Here
4179
				result.context);
4179
				result.context);
4180
		
4180
		
4181
		assertResults(
4181
		assertResults(
4182
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0150, Ltest0150.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4182
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0150, Ltest0150.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4183
				"ZZClass[TYPE_REF]{ZZClass, test0150, Ltest0150.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4183
				"ZZClass[TYPE_REF]{ZZClass, test0150, Ltest0150.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4184
				result.proposals);
4184
				result.proposals);
4185
	} finally {
4185
	} finally {
4186
		if(anAnnotation != null) {
4186
		if(anAnnotation != null) {
Lines 4225-4232 Link Here
4225
				result.context);
4225
				result.context);
4226
		
4226
		
4227
		assertResults(
4227
		assertResults(
4228
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0151, Ltest0151.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4228
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0151, Ltest0151.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4229
				"ZZClass[TYPE_REF]{ZZClass, test0151, Ltest0151.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4229
				"ZZClass[TYPE_REF]{ZZClass, test0151, Ltest0151.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4230
				result.proposals);
4230
				result.proposals);
4231
	} finally {
4231
	} finally {
4232
		if(anAnnotation != null) {
4232
		if(anAnnotation != null) {
Lines 4272-4280 Link Here
4272
				result.context);
4272
				result.context);
4273
		
4273
		
4274
		assertResults(
4274
		assertResults(
4275
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0152, Ltest0152.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4275
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0152, Ltest0152.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4276
				"ZZClass[TYPE_REF]{ZZClass, test0152, Ltest0152.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4276
				"ZZClass[TYPE_REF]{ZZClass, test0152, Ltest0152.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4277
				"zzint[FIELD_REF]{zzint, Ltest0152.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4277
				"zzint[FIELD_REF]{zzint, Ltest0152.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4278
				result.proposals);
4278
				result.proposals);
4279
	} finally {
4279
	} finally {
4280
		if(anAnnotation != null) {
4280
		if(anAnnotation != null) {
Lines 4320-4328 Link Here
4320
				result.context);
4320
				result.context);
4321
		
4321
		
4322
		assertResults(
4322
		assertResults(
4323
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0153, Ltest0153.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4323
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0153, Ltest0153.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4324
				"ZZClass[TYPE_REF]{ZZClass, test0153, Ltest0153.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4324
				"ZZClass[TYPE_REF]{ZZClass, test0153, Ltest0153.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4325
				"zzint[FIELD_REF]{zzint, Ltest0153.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4325
				"zzint[FIELD_REF]{zzint, Ltest0153.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4326
				result.proposals);
4326
				result.proposals);
4327
	} finally {
4327
	} finally {
4328
		if(anAnnotation != null) {
4328
		if(anAnnotation != null) {
Lines 4368-4376 Link Here
4368
				result.context);
4368
				result.context);
4369
		
4369
		
4370
		assertResults(
4370
		assertResults(
4371
				"zzint[FIELD_REF]{zzint, Ltest0154.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4371
				"zzint[FIELD_REF]{zzint, Ltest0154.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4372
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0154, Ltest0154.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4372
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0154, Ltest0154.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4373
				"ZZClass[TYPE_REF]{ZZClass, test0154, Ltest0154.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4373
				"ZZClass[TYPE_REF]{ZZClass, test0154, Ltest0154.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4374
				result.proposals);
4374
				result.proposals);
4375
	} finally {
4375
	} finally {
4376
		if(anAnnotation != null) {
4376
		if(anAnnotation != null) {
Lines 4416-4424 Link Here
4416
				result.context);
4416
				result.context);
4417
		
4417
		
4418
		assertResults(
4418
		assertResults(
4419
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0155, Ltest0155.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4419
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0155, Ltest0155.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4420
				"ZZClass[TYPE_REF]{ZZClass, test0155, Ltest0155.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4420
				"ZZClass[TYPE_REF]{ZZClass, test0155, Ltest0155.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4421
				"zzint[FIELD_REF]{zzint, Ltest0155.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4421
				"zzint[FIELD_REF]{zzint, Ltest0155.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4422
				result.proposals);
4422
				result.proposals);
4423
	} finally {
4423
	} finally {
4424
		if(anAnnotation != null) {
4424
		if(anAnnotation != null) {
Lines 4464-4472 Link Here
4464
				result.context);
4464
				result.context);
4465
		
4465
		
4466
		assertResults(
4466
		assertResults(
4467
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0156, Ltest0156.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4467
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0156, Ltest0156.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4468
				"ZZClass[TYPE_REF]{ZZClass, test0156, Ltest0156.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4468
				"ZZClass[TYPE_REF]{ZZClass, test0156, Ltest0156.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4469
				"zzint[FIELD_REF]{zzint, Ltest0156.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4469
				"zzint[FIELD_REF]{zzint, Ltest0156.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4470
				result.proposals);
4470
				result.proposals);
4471
	} finally {
4471
	} finally {
4472
		if(anAnnotation != null) {
4472
		if(anAnnotation != null) {
Lines 4512-4520 Link Here
4512
				result.context);
4512
				result.context);
4513
		
4513
		
4514
		assertResults(
4514
		assertResults(
4515
				"zzint[FIELD_REF]{zzint, Ltest0157.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4515
				"zzint[FIELD_REF]{zzint, Ltest0157.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4516
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0157, Ltest0157.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4516
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0157, Ltest0157.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4517
				"ZZClass[TYPE_REF]{ZZClass, test0157, Ltest0157.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4517
				"ZZClass[TYPE_REF]{ZZClass, test0157, Ltest0157.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4518
				result.proposals);
4518
				result.proposals);
4519
	} finally {
4519
	} finally {
4520
		if(anAnnotation != null) {
4520
		if(anAnnotation != null) {
Lines 4560-4568 Link Here
4560
				result.context);
4560
				result.context);
4561
		
4561
		
4562
		assertResults(
4562
		assertResults(
4563
				"zzint[FIELD_REF]{zzint, Ltest0158.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4563
				"zzint[FIELD_REF]{zzint, Ltest0158.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4564
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0158, Ltest0158.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4564
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0158, Ltest0158.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4565
				"ZZClass[TYPE_REF]{ZZClass, test0158, Ltest0158.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4565
				"ZZClass[TYPE_REF]{ZZClass, test0158, Ltest0158.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4566
				result.proposals);
4566
				result.proposals);
4567
	} finally {
4567
	} finally {
4568
		if(anAnnotation != null) {
4568
		if(anAnnotation != null) {
Lines 4608-4616 Link Here
4608
				result.context);
4608
				result.context);
4609
		
4609
		
4610
		assertResults(
4610
		assertResults(
4611
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0159, Ltest0159.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4611
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0159, Ltest0159.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4612
				"ZZClass[TYPE_REF]{ZZClass, test0159, Ltest0159.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4612
				"ZZClass[TYPE_REF]{ZZClass, test0159, Ltest0159.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4613
				"zzint[FIELD_REF]{zzint, Ltest0159.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4613
				"zzint[FIELD_REF]{zzint, Ltest0159.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4614
				result.proposals);
4614
				result.proposals);
4615
	} finally {
4615
	} finally {
4616
		if(anAnnotation != null) {
4616
		if(anAnnotation != null) {
Lines 4656-4664 Link Here
4656
				result.context);
4656
				result.context);
4657
		
4657
		
4658
		assertResults(
4658
		assertResults(
4659
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0160, Ltest0160.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4659
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0160, Ltest0160.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4660
				"ZZClass[TYPE_REF]{ZZClass, test0160, Ltest0160.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4660
				"ZZClass[TYPE_REF]{ZZClass, test0160, Ltest0160.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4661
				"zzint[FIELD_REF]{zzint, Ltest0160.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4661
				"zzint[FIELD_REF]{zzint, Ltest0160.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4662
				result.proposals);
4662
				result.proposals);
4663
	} finally {
4663
	} finally {
4664
		if(anAnnotation != null) {
4664
		if(anAnnotation != null) {
Lines 4704-4712 Link Here
4704
				result.context);
4704
				result.context);
4705
		
4705
		
4706
		assertResults(
4706
		assertResults(
4707
				"zzint[FIELD_REF]{zzint, Ltest0161.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4707
				"zzint[FIELD_REF]{zzint, Ltest0161.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4708
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0161, Ltest0161.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4708
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0161, Ltest0161.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4709
				"ZZClass[TYPE_REF]{ZZClass, test0161, Ltest0161.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4709
				"ZZClass[TYPE_REF]{ZZClass, test0161, Ltest0161.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4710
				result.proposals);
4710
				result.proposals);
4711
	} finally {
4711
	} finally {
4712
		if(anAnnotation != null) {
4712
		if(anAnnotation != null) {
Lines 4752-4760 Link Here
4752
				result.context);
4752
				result.context);
4753
		
4753
		
4754
		assertResults(
4754
		assertResults(
4755
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0162, Ltest0162.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4755
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0162, Ltest0162.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4756
				"ZZClass[TYPE_REF]{ZZClass, test0162, Ltest0162.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4756
				"ZZClass[TYPE_REF]{ZZClass, test0162, Ltest0162.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4757
				"zzint[FIELD_REF]{zzint, Ltest0162.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4757
				"zzint[FIELD_REF]{zzint, Ltest0162.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4758
				result.proposals);
4758
				result.proposals);
4759
	} finally {
4759
	} finally {
4760
		if(anAnnotation != null) {
4760
		if(anAnnotation != null) {
Lines 4800-4808 Link Here
4800
				result.context);
4800
				result.context);
4801
		
4801
		
4802
		assertResults(
4802
		assertResults(
4803
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0163, Ltest0163.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4803
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0163, Ltest0163.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4804
				"ZZClass[TYPE_REF]{ZZClass, test0163, Ltest0163.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4804
				"ZZClass[TYPE_REF]{ZZClass, test0163, Ltest0163.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4805
				"zzint[FIELD_REF]{zzint, Ltest0163.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4805
				"zzint[FIELD_REF]{zzint, Ltest0163.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4806
				result.proposals);
4806
				result.proposals);
4807
	} finally {
4807
	} finally {
4808
		if(anAnnotation != null) {
4808
		if(anAnnotation != null) {
Lines 4848-4856 Link Here
4848
				result.context);
4848
				result.context);
4849
		
4849
		
4850
		assertResults(
4850
		assertResults(
4851
				"zzint[FIELD_REF]{zzint, Ltest0164.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4851
				"zzint[FIELD_REF]{zzint, Ltest0164.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4852
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0164, Ltest0164.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4852
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0164, Ltest0164.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4853
				"ZZClass[TYPE_REF]{ZZClass, test0164, Ltest0164.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4853
				"ZZClass[TYPE_REF]{ZZClass, test0164, Ltest0164.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4854
				result.proposals);
4854
				result.proposals);
4855
	} finally {
4855
	} finally {
4856
		if(anAnnotation != null) {
4856
		if(anAnnotation != null) {
Lines 4896-4904 Link Here
4896
				result.context);
4896
				result.context);
4897
		
4897
		
4898
		assertResults(
4898
		assertResults(
4899
				"zzint[FIELD_REF]{zzint, Ltest0165.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4899
				"zzint[FIELD_REF]{zzint, Ltest0165.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4900
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0165, Ltest0165.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4900
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0165, Ltest0165.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4901
				"ZZClass[TYPE_REF]{ZZClass, test0165, Ltest0165.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4901
				"ZZClass[TYPE_REF]{ZZClass, test0165, Ltest0165.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4902
				result.proposals);
4902
				result.proposals);
4903
	} finally {
4903
	} finally {
4904
		if(anAnnotation != null) {
4904
		if(anAnnotation != null) {
Lines 4946-4954 Link Here
4946
				result.context);
4946
				result.context);
4947
		
4947
		
4948
		assertResults(
4948
		assertResults(
4949
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0166, Ltest0166.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4949
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0166, Ltest0166.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4950
				"ZZClass[TYPE_REF]{ZZClass, test0166, Ltest0166.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4950
				"ZZClass[TYPE_REF]{ZZClass, test0166, Ltest0166.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4951
				"zzint[FIELD_REF]{zzint, Ltest0166.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4951
				"zzint[FIELD_REF]{zzint, Ltest0166.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
4952
				result.proposals);
4952
				result.proposals);
4953
	} finally {
4953
	} finally {
4954
		if(anAnnotation != null) {
4954
		if(anAnnotation != null) {
Lines 4996-5004 Link Here
4996
				result.context);
4996
				result.context);
4997
		
4997
		
4998
		assertResults(
4998
		assertResults(
4999
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0167, Ltest0167.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
4999
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0167, Ltest0167.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5000
				"ZZClass[TYPE_REF]{ZZClass, test0167, Ltest0167.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5000
				"ZZClass[TYPE_REF]{ZZClass, test0167, Ltest0167.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5001
				"zzint[FIELD_REF]{zzint, Ltest0167.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5001
				"zzint[FIELD_REF]{zzint, Ltest0167.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5002
				result.proposals);
5002
				result.proposals);
5003
	} finally {
5003
	} finally {
5004
		if(anAnnotation != null) {
5004
		if(anAnnotation != null) {
Lines 5046-5054 Link Here
5046
				result.context);
5046
				result.context);
5047
		
5047
		
5048
		assertResults(
5048
		assertResults(
5049
				"zzint[FIELD_REF]{zzint, Ltest0168.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5049
				"zzint[FIELD_REF]{zzint, Ltest0168.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5050
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0168, Ltest0168.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5050
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0168, Ltest0168.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5051
				"ZZClass[TYPE_REF]{ZZClass, test0168, Ltest0168.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5051
				"ZZClass[TYPE_REF]{ZZClass, test0168, Ltest0168.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5052
				result.proposals);
5052
				result.proposals);
5053
	} finally {
5053
	} finally {
5054
		if(anAnnotation != null) {
5054
		if(anAnnotation != null) {
Lines 5096-5104 Link Here
5096
				result.context);
5096
				result.context);
5097
		
5097
		
5098
		assertResults(
5098
		assertResults(
5099
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0169, Ltest0169.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5099
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0169, Ltest0169.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5100
				"ZZClass[TYPE_REF]{ZZClass, test0169, Ltest0169.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5100
				"ZZClass[TYPE_REF]{ZZClass, test0169, Ltest0169.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5101
				"zzint[FIELD_REF]{zzint, Ltest0169.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5101
				"zzint[FIELD_REF]{zzint, Ltest0169.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5102
				result.proposals);
5102
				result.proposals);
5103
	} finally {
5103
	} finally {
5104
		if(anAnnotation != null) {
5104
		if(anAnnotation != null) {
Lines 5146-5154 Link Here
5146
				result.context);
5146
				result.context);
5147
		
5147
		
5148
		assertResults(
5148
		assertResults(
5149
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0170, Ltest0170.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5149
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0170, Ltest0170.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5150
				"ZZClass[TYPE_REF]{ZZClass, test0170, Ltest0170.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5150
				"ZZClass[TYPE_REF]{ZZClass, test0170, Ltest0170.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5151
				"zzint[FIELD_REF]{zzint, Ltest0170.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5151
				"zzint[FIELD_REF]{zzint, Ltest0170.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5152
				result.proposals);
5152
				result.proposals);
5153
	} finally {
5153
	} finally {
5154
		if(anAnnotation != null) {
5154
		if(anAnnotation != null) {
Lines 5196-5204 Link Here
5196
				result.context);
5196
				result.context);
5197
		
5197
		
5198
		assertResults(
5198
		assertResults(
5199
				"zzint[FIELD_REF]{zzint, Ltest0171.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5199
				"zzint[FIELD_REF]{zzint, Ltest0171.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5200
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0171, Ltest0171.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5200
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0171, Ltest0171.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5201
				"ZZClass[TYPE_REF]{ZZClass, test0171, Ltest0171.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5201
				"ZZClass[TYPE_REF]{ZZClass, test0171, Ltest0171.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5202
				result.proposals);
5202
				result.proposals);
5203
	} finally {
5203
	} finally {
5204
		if(anAnnotation != null) {
5204
		if(anAnnotation != null) {
Lines 5246-5254 Link Here
5246
				result.context);
5246
				result.context);
5247
		
5247
		
5248
		assertResults(
5248
		assertResults(
5249
				"zzint[FIELD_REF]{zzint, Ltest0172.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5249
				"zzint[FIELD_REF]{zzint, Ltest0172.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5250
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0172, Ltest0172.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5250
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0172, Ltest0172.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5251
				"ZZClass[TYPE_REF]{ZZClass, test0172, Ltest0172.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5251
				"ZZClass[TYPE_REF]{ZZClass, test0172, Ltest0172.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5252
				result.proposals);
5252
				result.proposals);
5253
	} finally {
5253
	} finally {
5254
		if(anAnnotation != null) {
5254
		if(anAnnotation != null) {
Lines 5294-5302 Link Here
5294
				result.context);
5294
				result.context);
5295
		
5295
		
5296
		assertResults(
5296
		assertResults(
5297
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0173, Ltest0173.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5297
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0173, Ltest0173.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5298
				"ZZClass[TYPE_REF]{ZZClass, test0173, Ltest0173.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5298
				"ZZClass[TYPE_REF]{ZZClass, test0173, Ltest0173.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5299
				"zzint[FIELD_REF]{zzint, Ltest0173.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5299
				"zzint[FIELD_REF]{zzint, Ltest0173.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5300
				result.proposals);
5300
				result.proposals);
5301
	} finally {
5301
	} finally {
5302
		if(anAnnotation != null) {
5302
		if(anAnnotation != null) {
Lines 5342-5350 Link Here
5342
				result.context);
5342
				result.context);
5343
		
5343
		
5344
		assertResults(
5344
		assertResults(
5345
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0174, Ltest0174.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5345
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0174, Ltest0174.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5346
				"ZZClass[TYPE_REF]{ZZClass, test0174, Ltest0174.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5346
				"ZZClass[TYPE_REF]{ZZClass, test0174, Ltest0174.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5347
				"zzint[FIELD_REF]{zzint, Ltest0174.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5347
				"zzint[FIELD_REF]{zzint, Ltest0174.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5348
				result.proposals);
5348
				result.proposals);
5349
	} finally {
5349
	} finally {
5350
		if(anAnnotation != null) {
5350
		if(anAnnotation != null) {
Lines 5390-5398 Link Here
5390
				result.context);
5390
				result.context);
5391
		
5391
		
5392
		assertResults(
5392
		assertResults(
5393
				"zzint[FIELD_REF]{zzint, Ltest0175.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5393
				"zzint[FIELD_REF]{zzint, Ltest0175.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5394
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0175, Ltest0175.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5394
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0175, Ltest0175.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5395
				"ZZClass[TYPE_REF]{ZZClass, test0175, Ltest0175.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5395
				"ZZClass[TYPE_REF]{ZZClass, test0175, Ltest0175.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5396
				result.proposals);
5396
				result.proposals);
5397
	} finally {
5397
	} finally {
5398
		if(anAnnotation != null) {
5398
		if(anAnnotation != null) {
Lines 5438-5446 Link Here
5438
				result.context);
5438
				result.context);
5439
		
5439
		
5440
		assertResults(
5440
		assertResults(
5441
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0176, Ltest0176.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5441
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0176, Ltest0176.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5442
				"ZZClass[TYPE_REF]{ZZClass, test0176, Ltest0176.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5442
				"ZZClass[TYPE_REF]{ZZClass, test0176, Ltest0176.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5443
				"zzint[FIELD_REF]{zzint, Ltest0176.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5443
				"zzint[FIELD_REF]{zzint, Ltest0176.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5444
				result.proposals);
5444
				result.proposals);
5445
	} finally {
5445
	} finally {
5446
		if(anAnnotation != null) {
5446
		if(anAnnotation != null) {
Lines 5486-5494 Link Here
5486
				result.context);
5486
				result.context);
5487
		
5487
		
5488
		assertResults(
5488
		assertResults(
5489
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0177, Ltest0177.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5489
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0177, Ltest0177.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5490
				"ZZClass[TYPE_REF]{ZZClass, test0177, Ltest0177.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5490
				"ZZClass[TYPE_REF]{ZZClass, test0177, Ltest0177.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5491
				"zzint[FIELD_REF]{zzint, Ltest0177.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5491
				"zzint[FIELD_REF]{zzint, Ltest0177.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5492
				result.proposals);
5492
				result.proposals);
5493
	} finally {
5493
	} finally {
5494
		if(anAnnotation != null) {
5494
		if(anAnnotation != null) {
Lines 5534-5542 Link Here
5534
				result.context);
5534
				result.context);
5535
		
5535
		
5536
		assertResults(
5536
		assertResults(
5537
				"zzint[FIELD_REF]{zzint, Ltest0178.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5537
				"zzint[FIELD_REF]{zzint, Ltest0178.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5538
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0178, Ltest0178.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5538
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0178, Ltest0178.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5539
				"ZZClass[TYPE_REF]{ZZClass, test0178, Ltest0178.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5539
				"ZZClass[TYPE_REF]{ZZClass, test0178, Ltest0178.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5540
				result.proposals);
5540
				result.proposals);
5541
	} finally {
5541
	} finally {
5542
		if(anAnnotation != null) {
5542
		if(anAnnotation != null) {
Lines 5582-5590 Link Here
5582
				result.context);
5582
				result.context);
5583
		
5583
		
5584
		assertResults(
5584
		assertResults(
5585
				"zzint[FIELD_REF]{zzint, Ltest0179.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5585
				"zzint[FIELD_REF]{zzint, Ltest0179.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5586
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0179, Ltest0179.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5586
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0179, Ltest0179.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5587
				"ZZClass[TYPE_REF]{ZZClass, test0179, Ltest0179.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5587
				"ZZClass[TYPE_REF]{ZZClass, test0179, Ltest0179.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5588
				result.proposals);
5588
				result.proposals);
5589
	} finally {
5589
	} finally {
5590
		if(anAnnotation != null) {
5590
		if(anAnnotation != null) {
Lines 5630-5638 Link Here
5630
				result.context);
5630
				result.context);
5631
		
5631
		
5632
		assertResults(
5632
		assertResults(
5633
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0180, Ltest0180.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5633
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0180, Ltest0180.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5634
				"ZZClass[TYPE_REF]{ZZClass, test0180, Ltest0180.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5634
				"ZZClass[TYPE_REF]{ZZClass, test0180, Ltest0180.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5635
				"zzint[FIELD_REF]{zzint, Ltest0180.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5635
				"zzint[FIELD_REF]{zzint, Ltest0180.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5636
				result.proposals);
5636
				result.proposals);
5637
	} finally {
5637
	} finally {
5638
		if(anAnnotation != null) {
5638
		if(anAnnotation != null) {
Lines 5678-5686 Link Here
5678
				result.context);
5678
				result.context);
5679
		
5679
		
5680
		assertResults(
5680
		assertResults(
5681
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0181, Ltest0181.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5681
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0181, Ltest0181.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5682
				"ZZClass[TYPE_REF]{ZZClass, test0181, Ltest0181.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5682
				"ZZClass[TYPE_REF]{ZZClass, test0181, Ltest0181.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5683
				"zzint[FIELD_REF]{zzint, Ltest0181.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5683
				"zzint[FIELD_REF]{zzint, Ltest0181.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5684
				result.proposals);
5684
				result.proposals);
5685
	} finally {
5685
	} finally {
5686
		if(anAnnotation != null) {
5686
		if(anAnnotation != null) {
Lines 5726-5734 Link Here
5726
				result.context);
5726
				result.context);
5727
		
5727
		
5728
		assertResults(
5728
		assertResults(
5729
				"zzint[FIELD_REF]{zzint, Ltest0182.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5729
				"zzint[FIELD_REF]{zzint, Ltest0182.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5730
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0182, Ltest0182.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5730
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0182, Ltest0182.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5731
				"ZZClass[TYPE_REF]{ZZClass, test0182, Ltest0182.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5731
				"ZZClass[TYPE_REF]{ZZClass, test0182, Ltest0182.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5732
				result.proposals);
5732
				result.proposals);
5733
	} finally {
5733
	} finally {
5734
		if(anAnnotation != null) {
5734
		if(anAnnotation != null) {
Lines 5774-5782 Link Here
5774
				result.context);
5774
				result.context);
5775
		
5775
		
5776
		assertResults(
5776
		assertResults(
5777
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0183, Ltest0183.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5777
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0183, Ltest0183.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5778
				"ZZClass[TYPE_REF]{ZZClass, test0183, Ltest0183.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5778
				"ZZClass[TYPE_REF]{ZZClass, test0183, Ltest0183.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5779
				"zzint[FIELD_REF]{zzint, Ltest0183.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5779
				"zzint[FIELD_REF]{zzint, Ltest0183.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5780
				result.proposals);
5780
				result.proposals);
5781
	} finally {
5781
	} finally {
5782
		if(anAnnotation != null) {
5782
		if(anAnnotation != null) {
Lines 5822-5830 Link Here
5822
				result.context);
5822
				result.context);
5823
		
5823
		
5824
		assertResults(
5824
		assertResults(
5825
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0184, Ltest0184.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5825
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0184, Ltest0184.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5826
				"ZZClass[TYPE_REF]{ZZClass, test0184, Ltest0184.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5826
				"ZZClass[TYPE_REF]{ZZClass, test0184, Ltest0184.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5827
				"zzint[FIELD_REF]{zzint, Ltest0184.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5827
				"zzint[FIELD_REF]{zzint, Ltest0184.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5828
				result.proposals);
5828
				result.proposals);
5829
	} finally {
5829
	} finally {
5830
		if(anAnnotation != null) {
5830
		if(anAnnotation != null) {
Lines 5870-5878 Link Here
5870
				result.context);
5870
				result.context);
5871
		
5871
		
5872
		assertResults(
5872
		assertResults(
5873
				"zzint[FIELD_REF]{zzint, Ltest0185.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5873
				"zzint[FIELD_REF]{zzint, Ltest0185.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5874
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0185, Ltest0185.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5874
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0185, Ltest0185.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5875
				"ZZClass[TYPE_REF]{ZZClass, test0185, Ltest0185.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5875
				"ZZClass[TYPE_REF]{ZZClass, test0185, Ltest0185.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5876
				result.proposals);
5876
				result.proposals);
5877
	} finally {
5877
	} finally {
5878
		if(anAnnotation != null) {
5878
		if(anAnnotation != null) {
Lines 5918-5926 Link Here
5918
				result.context);
5918
				result.context);
5919
		
5919
		
5920
		assertResults(
5920
		assertResults(
5921
				"zzint[FIELD_REF]{zzint, Ltest0186.Test;, I, zzint, null, " + (R_DEFAULT + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5921
				"zzint[FIELD_REF]{zzint, Ltest0186.Test;, I, zzint, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5922
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0186, Ltest0186.ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5922
				"ZZAnnotation[TYPE_REF]{ZZAnnotation, test0186, Ltest0186.ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
5923
				"ZZClass[TYPE_REF]{ZZClass, test0186, Ltest0186.ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5923
				"ZZClass[TYPE_REF]{ZZClass, test0186, Ltest0186.ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5924
				result.proposals);
5924
				result.proposals);
5925
	} finally {
5925
	} finally {
5926
		if(anAnnotation != null) {
5926
		if(anAnnotation != null) {
Lines 5955-5962 Link Here
5955
            result.context);
5955
            result.context);
5956
    
5956
    
5957
    assertResults(
5957
    assertResults(
5958
            "zzz1[FIELD_REF]{zzz1, Ltest0187.ZZClass1<!+TU;>;, [Ltest0187.ZZClass2<!+TU;>;, zzz1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
5958
            "zzz1[FIELD_REF]{zzz1, Ltest0187.ZZClass1<!+TU;>;, [Ltest0187.ZZClass2<!+TU;>;, zzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
5959
            "zzz2[METHOD_REF]{zzz2(), Ltest0187.ZZClass1<!+TU;>;, ()[Ltest0187.ZZClass2<!+TU;>;, zzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_NON_STATIC + R_NON_RESTRICTED) + "}",
5959
            "zzz2[METHOD_REF]{zzz2(), Ltest0187.ZZClass1<!+TU;>;, ()[Ltest0187.ZZClass2<!+TU;>;, zzz2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_NON_STATIC + R_NON_RESTRICTED) + "}",
5960
            result.proposals);
5960
            result.proposals);
5961
}
5961
}
5962
// completion test with capture
5962
// completion test with capture
Lines 5984-5991 Link Here
5984
            result.context);
5984
            result.context);
5985
    
5985
    
5986
    assertResults(
5986
    assertResults(
5987
            "var1[FIELD_REF]{var1, Ltest0188.Test<TU;>;, Ltest0188.ZZClass1<+TU;>;, var1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
5987
            "var1[FIELD_REF]{var1, Ltest0188.Test<TU;>;, Ltest0188.ZZClass1<+TU;>;, var1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED+ R_NON_RESTRICTED) + "}\n" +
5988
            "var2[LOCAL_VARIABLE_REF]{var2, null, Ltest0188.ZZClass1<+TU;>;, var2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5988
            "var2[LOCAL_VARIABLE_REF]{var2, null, Ltest0188.ZZClass1<+TU;>;, var2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
5989
            result.proposals);
5989
            result.proposals);
5990
}
5990
}
5991
// completion test with capture
5991
// completion test with capture
Lines 6011-6017 Link Here
6011
            result.context);
6011
            result.context);
6012
    
6012
    
6013
    assertResults(
6013
    assertResults(
6014
            "zzz1[FIELD_REF]{zzz1, Ltest0189.ZZClass3;, Ltest0189.ZZClass2<+Ljava.lang.Object;>;, zzz1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_NON_STATIC + R_NON_RESTRICTED) + "}",
6014
            "zzz1[FIELD_REF]{zzz1, Ltest0189.ZZClass3;, Ltest0189.ZZClass2<+Ljava.lang.Object;>;, zzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_NON_STATIC + R_NON_RESTRICTED) + "}",
6015
            result.proposals);
6015
            result.proposals);
6016
}
6016
}
6017
// completion test with capture
6017
// completion test with capture
Lines 6044-6051 Link Here
6044
            result.context);
6044
            result.context);
6045
    
6045
    
6046
    assertResults(
6046
    assertResults(
6047
            "zzz1[FIELD_REF]{zzz1, Ltest0190.ZZClass1<!+Ljava.lang.Object;>;, [Ltest0190.ZZClass2<!+Ljava.lang.Object;>;, zzz1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}\n" +
6047
            "zzz1[FIELD_REF]{zzz1, Ltest0190.ZZClass1<!+Ljava.lang.Object;>;, [Ltest0190.ZZClass2<!+Ljava.lang.Object;>;, zzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC+ R_NON_RESTRICTED) + "}\n" +
6048
            "zzz2[METHOD_REF]{zzz2(), Ltest0190.ZZClass1<!+Ljava.lang.Object;>;, ()[Ltest0190.ZZClass2<!+Ljava.lang.Object;>;, zzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_NON_STATIC + R_NON_RESTRICTED) + "}",
6048
            "zzz2[METHOD_REF]{zzz2(), Ltest0190.ZZClass1<!+Ljava.lang.Object;>;, ()[Ltest0190.ZZClass2<!+Ljava.lang.Object;>;, zzz2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_NON_STATIC + R_NON_RESTRICTED) + "}",
6049
            result.proposals);
6049
            result.proposals);
6050
}
6050
}
6051
// completion test with capture
6051
// completion test with capture
Lines 6073-6080 Link Here
6073
            result.context);
6073
            result.context);
6074
    
6074
    
6075
    assertResults(
6075
    assertResults(
6076
            "var1[FIELD_REF]{var1, Ltest0191.Test<TU;>;, Ltest0191.ZZClass1<+TU;>;, var1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
6076
            "var1[FIELD_REF]{var1, Ltest0191.Test<TU;>;, Ltest0191.ZZClass1<+TU;>;, var1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}\n" +
6077
            "var2[LOCAL_VARIABLE_REF]{var2, null, Ltest0191.ZZClass1<+TU;>;, var2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
6077
            "var2[LOCAL_VARIABLE_REF]{var2, null, Ltest0191.ZZClass1<+TU;>;, var2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + + R_UNQUALIFIED + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
6078
            result.proposals);
6078
            result.proposals);
6079
}
6079
}
6080
public void test0192() throws JavaModelException {
6080
public void test0192() throws JavaModelException {
Lines 6094-6100 Link Here
6094
            result.context);
6094
            result.context);
6095
    
6095
    
6096
    assertResults(
6096
    assertResults(
6097
            "ZZClass1<X,Y>[TYPE_REF]{, test0192, Ltest0192.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6097
            "ZZClass1<X,Y>[TYPE_REF]{, test0192, Ltest0192.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6098
            result.proposals);
6098
            result.proposals);
6099
}
6099
}
6100
public void test0193() throws JavaModelException {
6100
public void test0193() throws JavaModelException {
Lines 6116-6122 Link Here
6116
            result.context);
6116
            result.context);
6117
    
6117
    
6118
    assertResults(
6118
    assertResults(
6119
            "ZZClass1<X,Y>[TYPE_REF]{, test0193, Ltest0193.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME + R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6119
            "ZZClass1<X,Y>[TYPE_REF]{, test0193, Ltest0193.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME + R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6120
            result.proposals);
6120
            result.proposals);
6121
}
6121
}
6122
public void test0194() throws JavaModelException {
6122
public void test0194() throws JavaModelException {
Lines 6136-6142 Link Here
6136
            result.context);
6136
            result.context);
6137
    
6137
    
6138
    assertResults(
6138
    assertResults(
6139
            "ZZClass1<X,Y>[TYPE_REF]{, test0194, Ltest0194.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6139
            "ZZClass1<X,Y>[TYPE_REF]{, test0194, Ltest0194.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME+ R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6140
            result.proposals);
6140
            result.proposals);
6141
}
6141
}
6142
public void test0195() throws JavaModelException {
6142
public void test0195() throws JavaModelException {
Lines 6158-6164 Link Here
6158
            result.context);
6158
            result.context);
6159
    
6159
    
6160
    assertResults(
6160
    assertResults(
6161
            "ZZClass1<X,Y>[TYPE_REF]{, test0195, Ltest0195.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME + R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6161
            "ZZClass1<X,Y>[TYPE_REF]{, test0195, Ltest0195.ZZClass1<TX;TY;>;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_EXACT_NAME + R_UNQUALIFIED + + R_NON_RESTRICTED) + "}",
6162
            result.proposals);
6162
            result.proposals);
6163
}
6163
}
6164
public void test0196() throws JavaModelException {
6164
public void test0196() throws JavaModelException {
Lines 6202-6209 Link Here
6202
            result.context);
6202
            result.context);
6203
    
6203
    
6204
    assertResults(
6204
    assertResults(
6205
    		"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0196.ZZAnnot;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
6205
    		"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0196.ZZAnnot;, I, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
6206
            "foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0196.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6206
            "foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0196.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6207
            result.proposals);
6207
            result.proposals);
6208
}
6208
}
6209
public void test0197() throws JavaModelException {
6209
public void test0197() throws JavaModelException {
Lines 6249-6256 Link Here
6249
            result.context);
6249
            result.context);
6250
    
6250
    
6251
    assertResults(
6251
    assertResults(
6252
    		"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0197.ZZAnnot;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
6252
    		"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0197.ZZAnnot;, I, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
6253
            "foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0197.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6253
            "foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0197.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6254
            result.proposals);
6254
            result.proposals);
6255
}
6255
}
6256
public void test0198() throws JavaModelException {
6256
public void test0198() throws JavaModelException {
Lines 6296-6303 Link Here
6296
            result.context);
6296
            result.context);
6297
    
6297
    
6298
    assertResults(
6298
    assertResults(
6299
    		"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0198.ZZAnnot;, I, foo1, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
6299
    		"foo1[ANNOTATION_ATTRIBUTE_REF]{foo1, Ltest0198.ZZAnnot;, I, foo1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
6300
            "foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0198.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6300
            "foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0198.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6301
            result.proposals);
6301
            result.proposals);
6302
}
6302
}
6303
public void test0199() throws JavaModelException {
6303
public void test0199() throws JavaModelException {
Lines 6341-6347 Link Here
6341
            result.context);
6341
            result.context);
6342
    
6342
    
6343
    assertResults(
6343
    assertResults(
6344
    		"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0199.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6344
    		"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0199.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6345
            result.proposals);
6345
            result.proposals);
6346
}
6346
}
6347
public void test0200() throws JavaModelException {
6347
public void test0200() throws JavaModelException {
Lines 6387-6393 Link Here
6387
            result.context);
6387
            result.context);
6388
    
6388
    
6389
    assertResults(
6389
    assertResults(
6390
    		"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0200.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6390
    		"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0200.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6391
            result.proposals);
6391
            result.proposals);
6392
}
6392
}
6393
public void test0201() throws JavaModelException {
6393
public void test0201() throws JavaModelException {
Lines 6433-6439 Link Here
6433
            result.context);
6433
            result.context);
6434
    
6434
    
6435
    assertResults(
6435
    assertResults(
6436
    		"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0201.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6436
    		"foo2[ANNOTATION_ATTRIBUTE_REF]{foo2, Ltest0201.ZZAnnot;, I, foo2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
6437
            result.proposals);
6437
            result.proposals);
6438
}
6438
}
6439
public void test0202() throws JavaModelException {
6439
public void test0202() throws JavaModelException {
Lines 6470-6480 Link Here
6470
	            result.context);
6470
	            result.context);
6471
	    
6471
	    
6472
	    assertResults(
6472
	    assertResults(
6473
	            "ZZType[TYPE_REF]{p.ZZType, p, Lp.ZZType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6473
	            "ZZType[TYPE_REF]{p.ZZType, p, Lp.ZZType;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6474
				"ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6474
				"ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6475
				"ZZType.ZZClass[TYPE_REF]{p.ZZType.ZZClass, p, Lp.ZZType$ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6475
				"ZZType.ZZClass[TYPE_REF]{p.ZZType.ZZClass, p, Lp.ZZType$ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6476
				"ZZType.ZZEnum[TYPE_REF]{p.ZZType.ZZEnum, p, Lp.ZZType$ZZEnum;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6476
				"ZZType.ZZEnum[TYPE_REF]{p.ZZType.ZZEnum, p, Lp.ZZType$ZZEnum;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6477
				"ZZType.ZZInterface[TYPE_REF]{p.ZZType.ZZInterface, p, Lp.ZZType$ZZInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6477
				"ZZType.ZZInterface[TYPE_REF]{p.ZZType.ZZInterface, p, Lp.ZZType$ZZInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6478
	            result.proposals);
6478
	            result.proposals);
6479
	} finally {
6479
	} finally {
6480
		if(aType != null) {
6480
		if(aType != null) {
Lines 6513-6520 Link Here
6513
	            result.context);
6513
	            result.context);
6514
	    
6514
	    
6515
	    assertResults(
6515
	    assertResults(
6516
	            "ZZType[TYPE_REF]{p.ZZType, p, Lp.ZZType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) + "}\n" +
6516
	            "ZZType[TYPE_REF]{p.ZZType, p, Lp.ZZType;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) + "}\n" +
6517
				"ZZType.ZZClass[TYPE_REF]{p.ZZType.ZZClass, p, Lp.ZZType$ZZClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) + "}",
6517
				"ZZType.ZZClass[TYPE_REF]{p.ZZType.ZZClass, p, Lp.ZZType$ZZClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_CLASS + R_NON_RESTRICTED) + "}",
6518
	            result.proposals);
6518
	            result.proposals);
6519
	} finally {
6519
	} finally {
6520
		if(aType != null) {
6520
		if(aType != null) {
Lines 6553-6560 Link Here
6553
	            result.context);
6553
	            result.context);
6554
	    
6554
	    
6555
	    assertResults(
6555
	    assertResults(
6556
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}\n" +
6556
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}\n" +
6557
				"ZZType.ZZInterface[TYPE_REF]{p.ZZType.ZZInterface, p, Lp.ZZType$ZZInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}",
6557
				"ZZType.ZZInterface[TYPE_REF]{p.ZZType.ZZInterface, p, Lp.ZZType$ZZInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}",
6558
	            result.proposals);
6558
	            result.proposals);
6559
	} finally {
6559
	} finally {
6560
		if(aType != null) {
6560
		if(aType != null) {
Lines 6593-6600 Link Here
6593
	            result.context);
6593
	            result.context);
6594
	    
6594
	    
6595
	    assertResults(
6595
	    assertResults(
6596
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}\n" +
6596
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}\n" +
6597
				"ZZType.ZZInterface[TYPE_REF]{p.ZZType.ZZInterface, p, Lp.ZZType$ZZInterface;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}",
6597
				"ZZType.ZZInterface[TYPE_REF]{p.ZZType.ZZInterface, p, Lp.ZZType$ZZInterface;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_INTERFACE + R_NON_RESTRICTED) + "}",
6598
	            result.proposals);
6598
	            result.proposals);
6599
	} finally {
6599
	} finally {
6600
		if(aType != null) {
6600
		if(aType != null) {
Lines 6634-6640 Link Here
6634
	            result.context);
6634
	            result.context);
6635
	    
6635
	    
6636
	    assertResults(
6636
	    assertResults(
6637
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
6637
	            "ZZType.ZZAnnotation[TYPE_REF]{p.ZZType.ZZAnnotation, p, Lp.ZZType$ZZAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
6638
	            result.proposals);
6638
	            result.proposals);
6639
	} finally {
6639
	} finally {
6640
		if(aType != null) {
6640
		if(aType != null) {
Lines 6665-6671 Link Here
6665
	            result.context);
6665
	            result.context);
6666
	    
6666
	    
6667
	    assertResults(
6667
	    assertResults(
6668
	            "Annot[TYPE_REF]{p.Annot, p, Lp.Annot;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_ANNOTATION + R_QUALIFIED + R_NON_RESTRICTED) + "}",
6668
	            "Annot[TYPE_REF]{p.Annot, p, Lp.Annot;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_ANNOTATION + R_QUALIFIED + R_NON_RESTRICTED) + "}",
6669
	            result.proposals);
6669
	            result.proposals);
6670
	} finally {
6670
	} finally {
6671
		if(aType != null) {
6671
		if(aType != null) {
Lines 6746-6753 Link Here
6746
	            result.context);
6746
	            result.context);
6747
	
6747
	
6748
		assertResults(
6748
		assertResults(
6749
				"ImportedClass[TYPE_REF]{test0209.p.ImportedClass., test0209.p, Ltest0209.p.ImportedClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6749
				"ImportedClass[TYPE_REF]{test0209.p.ImportedClass., test0209.p, Ltest0209.p.ImportedClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
6750
				"ImportedClass.ImportedMember[TYPE_REF]{test0209.p.ImportedClass.ImportedMember;, test0209.p, Ltest0209.p.ImportedClass$ImportedMember;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6750
				"ImportedClass.ImportedMember[TYPE_REF]{test0209.p.ImportedClass.ImportedMember;, test0209.p, Ltest0209.p.ImportedClass$ImportedMember;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6751
				result.proposals);
6751
				result.proposals);
6752
	} finally {
6752
	} finally {
6753
		if(importedClass != null) {
6753
		if(importedClass != null) {
Lines 6829-6835 Link Here
6829
	            result.context);
6829
	            result.context);
6830
	
6830
	
6831
		assertResults(
6831
		assertResults(
6832
				"ImportedClass.ImportedMember[TYPE_REF]{test0211.p.ImportedClass.ImportedMember;, test0211.p, Ltest0211.p.ImportedClass$ImportedMember;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6832
				"ImportedClass.ImportedMember[TYPE_REF]{test0211.p.ImportedClass.ImportedMember;, test0211.p, Ltest0211.p.ImportedClass$ImportedMember;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6833
				result.proposals);
6833
				result.proposals);
6834
	} finally {
6834
	} finally {
6835
		if(importedClass != null) {
6835
		if(importedClass != null) {
Lines 6870-6876 Link Here
6870
	            result.context);
6870
	            result.context);
6871
	
6871
	
6872
		assertResults(
6872
		assertResults(
6873
				"ImportedClass[TYPE_REF]{test0212.p.ImportedClass;, test0212.p, Ltest0212.p.ImportedClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6873
				"ImportedClass[TYPE_REF]{test0212.p.ImportedClass;, test0212.p, Ltest0212.p.ImportedClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6874
				result.proposals);
6874
				result.proposals);
6875
	} finally {
6875
	} finally {
6876
		if(importedClass != null) {
6876
		if(importedClass != null) {
Lines 6909-6915 Link Here
6909
	            result.context);
6909
	            result.context);
6910
	
6910
	
6911
		assertResults(
6911
		assertResults(
6912
				"ImportedClass[TYPE_REF]{test0213.p.ImportedClass;, test0213.p, Ltest0213.p.ImportedClass;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6912
				"ImportedClass[TYPE_REF]{test0213.p.ImportedClass;, test0213.p, Ltest0213.p.ImportedClass;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
6913
				result.proposals);
6913
				result.proposals);
6914
	} finally {
6914
	} finally {
6915
		if(importedClass != null) {
6915
		if(importedClass != null) {
Lines 6966-6974 Link Here
6966
	            result.context);
6966
	            result.context);
6967
	
6967
	
6968
		assertResults(
6968
		assertResults(
6969
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0214.Test<TZ;>;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
6969
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0214.Test<TZ;>;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
6970
				"foo[METHOD_DECLARATION]{public <M extends AClass1> void foo(M p1), Ltest0214.SuperClass<TZ;>;, <M:Ltest0214.AClass1;>(TM;)V, foo, (p1), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}\n" +
6970
				"foo[METHOD_DECLARATION]{public <M extends AClass1> void foo(M p1), Ltest0214.SuperClass<TZ;>;, <M:Ltest0214.AClass1;>(TM;)V, foo, (p1), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}\n" +
6971
				"foo[METHOD_DECLARATION]{public <M extends AClass2> void foo(M p2), Ltest0214.SuperClass<TZ;>;, <M:Ltest0214.AClass2;>(TM;)V, foo, (p2), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
6971
				"foo[METHOD_DECLARATION]{public <M extends AClass2> void foo(M p2), Ltest0214.SuperClass<TZ;>;, <M:Ltest0214.AClass2;>(TM;)V, foo, (p2), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
6972
				result.proposals);
6972
				result.proposals);
6973
	} finally {
6973
	} finally {
6974
		if(paramClass1 != null) {
6974
		if(paramClass1 != null) {
Lines 7024-7031 Link Here
7024
	            result.context);
7024
	            result.context);
7025
	
7025
	
7026
		assertResults(
7026
		assertResults(
7027
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0215.Test<TZ;>;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7027
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0215.Test<TZ;>;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7028
				"foo[METHOD_DECLARATION]{public <M extends test0215.SuperClass<Z>> test0215.SuperClass<?> foo(test0215.p.ParamClass.MemberParamClass<? super Z> p1, int p2) throws Exception, Ltest0215.SuperClass<TZ;>;, <M:Ltest0215.SuperClass<TZ;>;>(Ltest0215.p.ParamClass$MemberParamClass<-TZ;>;I)Ltest0215.SuperClass<*>;, foo, (p1, p2), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
7028
				"foo[METHOD_DECLARATION]{public <M extends test0215.SuperClass<Z>> test0215.SuperClass<?> foo(test0215.p.ParamClass.MemberParamClass<? super Z> p1, int p2) throws Exception, Ltest0215.SuperClass<TZ;>;, <M:Ltest0215.SuperClass<TZ;>;>(Ltest0215.p.ParamClass$MemberParamClass<-TZ;>;I)Ltest0215.SuperClass<*>;, foo, (p1, p2), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
7029
				result.proposals);
7029
				result.proposals);
7030
	} finally {
7030
	} finally {
7031
		if(paramClass != null) {
7031
		if(paramClass != null) {
Lines 7085-7093 Link Here
7085
	            result.context);
7085
	            result.context);
7086
	
7086
	
7087
		assertResults(
7087
		assertResults(
7088
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0216.Test<TZ;>;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7088
				"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0216.Test<TZ;>;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7089
				"foo[METHOD_DECLARATION]{public void foo(test0216.p.ParamClass p1), Ltest0216.SuperClass<TZ;>;, (Ltest0216.p.ParamClass;)V, foo, (p1), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}\n" +
7089
				"foo[METHOD_DECLARATION]{public void foo(test0216.p.ParamClass p1), Ltest0216.SuperClass<TZ;>;, (Ltest0216.p.ParamClass;)V, foo, (p1), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}\n" +
7090
				"foo[METHOD_DECLARATION]{public void foo(test0216.q.ParamClass p2), Ltest0216.SuperClass<TZ;>;, (Ltest0216.q.ParamClass;)V, foo, (p2), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
7090
				"foo[METHOD_DECLARATION]{public void foo(test0216.q.ParamClass p2), Ltest0216.SuperClass<TZ;>;, (Ltest0216.q.ParamClass;)V, foo, (p2), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
7091
				result.proposals);
7091
				result.proposals);
7092
	} finally {
7092
	} finally {
7093
		if(paramClass1 != null) {
7093
		if(paramClass1 != null) {
Lines 7132-7138 Link Here
7132
	            result.context);
7132
	            result.context);
7133
	
7133
	
7134
		assertResults(
7134
		assertResults(
7135
				"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7135
				"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7136
				result.proposals);
7136
				result.proposals);
7137
	} finally {
7137
	} finally {
7138
		if(paramClass1 != null) {
7138
		if(paramClass1 != null) {
Lines 7171-7177 Link Here
7171
	            result.context);
7171
	            result.context);
7172
	
7172
	
7173
		assertResults(
7173
		assertResults(
7174
				"super[KEYWORD]{super, null, null, super, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7174
				"super[KEYWORD]{super, null, null, super, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7175
				result.proposals);
7175
				result.proposals);
7176
	} finally {
7176
	} finally {
7177
		if(paramClass1 != null) {
7177
		if(paramClass1 != null) {
Lines 7212-7218 Link Here
7212
	            result.context);
7212
	            result.context);
7213
	
7213
	
7214
		assertResults(
7214
		assertResults(
7215
				"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7215
				"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7216
				result.proposals);
7216
				result.proposals);
7217
	} finally {
7217
	} finally {
7218
		if(paramClass1 != null) {
7218
		if(paramClass1 != null) {
Lines 7253-7259 Link Here
7253
	            result.context);
7253
	            result.context);
7254
	
7254
	
7255
		assertResults(
7255
		assertResults(
7256
				"super[KEYWORD]{super, null, null, super, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7256
				"super[KEYWORD]{super, null, null, super, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7257
				result.proposals);
7257
				result.proposals);
7258
	} finally {
7258
	} finally {
7259
		if(paramClass1 != null) {
7259
		if(paramClass1 != null) {
Lines 7289-7295 Link Here
7289
	            result.context);
7289
	            result.context);
7290
	
7290
	
7291
		assertResults(
7291
		assertResults(
7292
				"AType[TYPE_REF]{AType, test0221, Ltest0221.AType;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7292
				"AType[TYPE_REF]{AType, test0221, Ltest0221.AType;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7293
				result.proposals);
7293
				result.proposals);
7294
	} finally {
7294
	} finally {
7295
		if(paramClass1 != null) {
7295
		if(paramClass1 != null) {
Lines 7330-7337 Link Here
7330
	            result.context);
7330
	            result.context);
7331
	
7331
	
7332
		assertResults(
7332
		assertResults(
7333
				"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
7333
				"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
7334
				"super[KEYWORD]{super, null, null, super, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7334
				"super[KEYWORD]{super, null, null, super, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7335
				result.proposals);
7335
				result.proposals);
7336
	} finally {
7336
	} finally {
7337
		if(paramClass1 != null) {
7337
		if(paramClass1 != null) {
Lines 7376-7382 Link Here
7376
		int start = end - "test0223.AType.va".length();
7376
		int start = end - "test0223.AType.va".length();
7377
		
7377
		
7378
		assertResults(
7378
		assertResults(
7379
				"VAR[FIELD_REF]{test0223.AType.VAR;, Ltest0223.AType;, I, VAR, null, ["+start+", "+end+"], " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
7379
				"VAR[FIELD_REF]{test0223.AType.VAR;, Ltest0223.AType;, I, VAR, null, ["+start+", "+end+"], " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
7380
				result.proposals);
7380
				result.proposals);
7381
	} finally {
7381
	} finally {
7382
		if(paramClass1 != null) {
7382
		if(paramClass1 != null) {
Lines 7403-7409 Link Here
7403
            result.context);
7403
            result.context);
7404
	
7404
	
7405
	assertResults(
7405
	assertResults(
7406
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7406
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7407
			result.proposals);
7407
			result.proposals);
7408
}
7408
}
7409
/*
7409
/*
Lines 7425-7431 Link Here
7425
            result.context);
7425
            result.context);
7426
	
7426
	
7427
	assertResults(
7427
	assertResults(
7428
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7428
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7429
			result.proposals);
7429
			result.proposals);
7430
}
7430
}
7431
/*
7431
/*
Lines 7448-7454 Link Here
7448
            result.context);
7448
            result.context);
7449
	
7449
	
7450
	assertResults(
7450
	assertResults(
7451
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7451
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7452
			result.proposals);
7452
			result.proposals);
7453
}
7453
}
7454
/*
7454
/*
Lines 7471-7477 Link Here
7471
            result.context);
7471
            result.context);
7472
	
7472
	
7473
	assertResults(
7473
	assertResults(
7474
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7474
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7475
			result.proposals);
7475
			result.proposals);
7476
}
7476
}
7477
/*
7477
/*
Lines 7496-7502 Link Here
7496
            result.context);
7496
            result.context);
7497
7497
7498
	assertResults(
7498
	assertResults(
7499
			"class[FIELD_REF]{class, null, Ljava.lang.Class<Ltest0228/Test;>;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
7499
			"class[FIELD_REF]{class, null, Ljava.lang.Class<Ltest0228/Test;>;, class, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
7500
			result.proposals);
7500
			result.proposals);
7501
}
7501
}
7502
/*
7502
/*
Lines 7521-7527 Link Here
7521
            result.context);
7521
            result.context);
7522
7522
7523
	assertResults(
7523
	assertResults(
7524
			"class[FIELD_REF]{class, null, Ljava.lang.Class<Ltest0229/Test;>;, class, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
7524
			"class[FIELD_REF]{class, null, Ljava.lang.Class<Ltest0229/Test;>;, class, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
7525
			result.proposals);
7525
			result.proposals);
7526
}
7526
}
7527
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96944
7527
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=96944
Lines 7595-7601 Link Here
7595
				result.proposals);
7595
				result.proposals);
7596
    } else {
7596
    } else {
7597
    	assertResults(
7597
    	assertResults(
7598
				"Test<ZT>[TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7598
				"Test<ZT>[TYPE_REF]{Test, test0232, Ltest0232.Test<TZT;>;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7599
				result.proposals);
7599
				result.proposals);
7600
    }
7600
    }
7601
}
7601
}
Lines 7621-7627 Link Here
7621
            result.context);
7621
            result.context);
7622
7622
7623
	assertResults(
7623
	assertResults(
7624
			"Test0233Z<ZT>[TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7624
			"Test0233Z<ZT>[TYPE_REF]{Test0233Z, test0233, Ltest0233.Test0233Z<TZT;>;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME+ R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7625
			result.proposals);
7625
			result.proposals);
7626
}
7626
}
7627
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97860
7627
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97860
Lines 7689-7696 Link Here
7689
            result.context);
7689
            result.context);
7690
7690
7691
	assertResults(
7691
	assertResults(
7692
			"Test[METHOD_REF<CONSTRUCTOR>]{, Ltest0236.Test<Ljava.lang.String;>;, ()V, Test, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7692
			"Test[METHOD_REF<CONSTRUCTOR>]{, Ltest0236.Test<Ljava.lang.String;>;, ()V, Test, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7693
			"Test<java.lang.String>[ANONYMOUS_CLASS_DECLARATION]{, Ltest0236.Test<Ljava.lang.String;>;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
7693
			"Test<java.lang.String>[ANONYMOUS_CLASS_DECLARATION]{, Ltest0236.Test<Ljava.lang.String;>;, ()V, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
7694
			result.proposals);
7694
			result.proposals);
7695
}
7695
}
7696
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
7696
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
Lines 7710-7716 Link Here
7710
            result.context);
7710
            result.context);
7711
7711
7712
	assertResults(
7712
	assertResults(
7713
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7713
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7714
			result.proposals);
7714
			result.proposals);
7715
}
7715
}
7716
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
7716
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
Lines 7730-7736 Link Here
7730
            result.context);
7730
            result.context);
7731
7731
7732
	assertResults(
7732
	assertResults(
7733
			"implements[KEYWORD]{implements, null, null, implements, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7733
			"implements[KEYWORD]{implements, null, null, implements, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7734
			result.proposals);
7734
			result.proposals);
7735
}
7735
}
7736
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
7736
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
Lines 7770-7776 Link Here
7770
            result.context);
7770
            result.context);
7771
7771
7772
	assertResults(
7772
	assertResults(
7773
			"implements[KEYWORD]{implements, null, null, implements, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7773
			"implements[KEYWORD]{implements, null, null, implements, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7774
			result.proposals);
7774
			result.proposals);
7775
}
7775
}
7776
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
7776
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
Lines 7790-7796 Link Here
7790
            result.context);
7790
            result.context);
7791
7791
7792
	assertResults(
7792
	assertResults(
7793
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7793
			"extends[KEYWORD]{extends, null, null, extends, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
7794
			result.proposals);
7794
			result.proposals);
7795
}
7795
}
7796
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
7796
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=94907
Lines 7834-7840 Link Here
7834
			"foo(new Object() {}).b");
7834
			"foo(new Object() {}).b");
7835
7835
7836
		assertResults(
7836
		assertResults(
7837
			"bar[METHOD_REF]{bar(), Ltest0243.Y<LObject;>;, ()LObject;, bar, null, 29}", 
7837
			"bar[METHOD_REF]{bar(), Ltest0243.Y<LObject;>;, ()LObject;, bar, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}", 
7838
			result.proposals);
7838
			result.proposals);
7839
}
7839
}
7840
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=100009
7840
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=100009
Lines 7849-7857 Link Here
7849
			"foo");
7849
			"foo");
7850
7850
7851
		assertResults(
7851
		assertResults(
7852
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0244.X;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7852
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest0244.X;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7853
			"foo[METHOD_DECLARATION]{public Object foo(Object t), Lgenerics.ZAGenericType;, (Ljava.lang.Object;)Ljava.lang.Object;, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}\n" +
7853
			"foo[METHOD_DECLARATION]{public Object foo(Object t), Lgenerics.ZAGenericType;, (Ljava.lang.Object;)Ljava.lang.Object;, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}\n" +
7854
			"foo[METHOD_DECLARATION]{public Object foo(ZAGenericType var), Lgenerics.ZAGenericType;, (Lgenerics.ZAGenericType;)Ljava.lang.Object;, foo, (var), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
7854
			"foo[METHOD_DECLARATION]{public Object foo(ZAGenericType var), Lgenerics.ZAGenericType;, (Lgenerics.ZAGenericType;)Ljava.lang.Object;, foo, (var), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
7855
			result.proposals);
7855
			result.proposals);
7856
}
7856
}
7857
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=101456
7857
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=101456
Lines 7891-7897 Link Here
7891
			"ann");
7891
			"ann");
7892
7892
7893
		assertResults(
7893
		assertResults(
7894
			"Annotation[TYPE_REF]{java.lang.annotation.Annotation, java.lang.annotation, Ljava.lang.annotation.Annotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
7894
			"Annotation[TYPE_REF]{java.lang.annotation.Annotation, java.lang.annotation, Ljava.lang.annotation.Annotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
7895
			result.proposals);
7895
			result.proposals);
7896
}
7896
}
7897
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102284
7897
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102284
Lines 7909-7916 Link Here
7909
			"Type<String, String> (");
7909
			"Type<String, String> (");
7910
7910
7911
		assertResults(
7911
		assertResults(
7912
			"Type[METHOD_REF<CONSTRUCTOR>]{, LType<Ljava.lang.String;Ljava.lang.String;>;, ()V, Type, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7912
			"Type[METHOD_REF<CONSTRUCTOR>]{, LType<Ljava.lang.String;Ljava.lang.String;>;, ()V, Type, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
7913
			"Type<java.lang.String,java.lang.String>[ANONYMOUS_CLASS_DECLARATION]{, LType<Ljava.lang.String;Ljava.lang.String;>;, ()V, null, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}",
7913
			"Type<java.lang.String,java.lang.String>[ANONYMOUS_CLASS_DECLARATION]{, LType<Ljava.lang.String;Ljava.lang.String;>;, ()V, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}",
7914
			result.proposals);
7914
			result.proposals);
7915
}
7915
}
7916
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
7916
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102572
Lines 7947-7954 Link Here
7947
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
7947
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
7948
	
7948
	
7949
		assertResults(
7949
		assertResults(
7950
				"oneTwoThree[METHOD_REF]{oneTwoThree(), Lcamelcase.ImportedType;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
7950
				"oneTwoThree[METHOD_REF]{oneTwoThree(), Lcamelcase.ImportedType;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
7951
				"oTTMethod[METHOD_REF]{oTTMethod(), Lcamelcase.ImportedType;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7951
				"oTTMethod[METHOD_REF]{oTTMethod(), Lcamelcase.ImportedType;, ()V, oTTMethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7952
				requestor.getResults());
7952
				requestor.getResults());
7953
	} finally {
7953
	} finally {
7954
		JavaCore.setOptions(oldOptions);
7954
		JavaCore.setOptions(oldOptions);
Lines 7988-7995 Link Here
7988
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
7988
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
7989
	
7989
	
7990
		assertResults(
7990
		assertResults(
7991
				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.ImportedType;, I, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
7991
				"oneTwoThree[FIELD_REF]{oneTwoThree, Lcamelcase.ImportedType;, I, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
7992
				"oTTField[FIELD_REF]{oTTField, Lcamelcase.ImportedType;, I, oTTField, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7992
				"oTTField[FIELD_REF]{oTTField, Lcamelcase.ImportedType;, I, oTTField, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
7993
				requestor.getResults());
7993
				requestor.getResults());
7994
	} finally {
7994
	} finally {
7995
		JavaCore.setOptions(oldOptions);
7995
		JavaCore.setOptions(oldOptions);
Lines 8026-8033 Link Here
8026
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8026
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8027
	
8027
	
8028
		assertResults(
8028
		assertResults(
8029
				"oneTwoThree[METHOD_IMPORT]{camelcase.ImportedType.oneTwoThree;, Lcamelcase.ImportedType;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
8029
				"oneTwoThree[METHOD_IMPORT]{camelcase.ImportedType.oneTwoThree;, Lcamelcase.ImportedType;, ()V, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_NON_RESTRICTED) + "}\n" +
8030
				"oTTMethod[METHOD_IMPORT]{camelcase.ImportedType.oTTMethod;, Lcamelcase.ImportedType;, ()V, oTTMethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8030
				"oTTMethod[METHOD_IMPORT]{camelcase.ImportedType.oTTMethod;, Lcamelcase.ImportedType;, ()V, oTTMethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8031
				requestor.getResults());
8031
				requestor.getResults());
8032
	} finally {
8032
	} finally {
8033
		JavaCore.setOptions(oldOptions);
8033
		JavaCore.setOptions(oldOptions);
Lines 8064-8071 Link Here
8064
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8064
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8065
	
8065
	
8066
		assertResults(
8066
		assertResults(
8067
				"oneTwoThree[ANNOTATION_ATTRIBUTE_REF]{oneTwoThree, Lcamelcase.Annot;, Ljava.lang.String;, oneTwoThree, null, " + (R_DEFAULT + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8067
				"oneTwoThree[ANNOTATION_ATTRIBUTE_REF]{oneTwoThree, Lcamelcase.Annot;, Ljava.lang.String;, oneTwoThree, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CAMEL_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8068
				"oTTAttribute[ANNOTATION_ATTRIBUTE_REF]{oTTAttribute, Lcamelcase.Annot;, Ljava.lang.String;, oTTAttribute, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
8068
				"oTTAttribute[ANNOTATION_ATTRIBUTE_REF]{oTTAttribute, Lcamelcase.Annot;, Ljava.lang.String;, oTTAttribute, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
8069
				requestor.getResults());
8069
				requestor.getResults());
8070
	} finally {
8070
	} finally {
8071
		JavaCore.setOptions(oldOptions);
8071
		JavaCore.setOptions(oldOptions);
Lines 8098-8105 Link Here
8098
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8098
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8099
8099
8100
	assertResults(
8100
	assertResults(
8101
			"zzfield[FIELD_REF]{zzfield, Ltest.SuperClass;, I, zzfield, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
8101
			"zzfield[FIELD_REF]{zzfield, Ltest.SuperClass;, I, zzfield, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
8102
			"zzmethod[METHOD_REF]{zzmethod(), Ltest.SuperClass;, ()V, zzmethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8102
			"zzmethod[METHOD_REF]{zzmethod(), Ltest.SuperClass;, ()V, zzmethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8103
			requestor.getResults());
8103
			requestor.getResults());
8104
}
8104
}
8105
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=113945
8105
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=113945
Lines 8129-8136 Link Here
8129
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8129
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8130
8130
8131
	assertResults(
8131
	assertResults(
8132
			"zzfield[FIELD_REF]{zzfield, Ltest.SuperInterface;, I, zzfield, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8132
			"zzfield[FIELD_REF]{zzfield, Ltest.SuperInterface;, I, zzfield, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8133
			"zzmethod[METHOD_REF]{zzmethod(), Ltest.SuperInterface;, ()V, zzmethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8133
			"zzmethod[METHOD_REF]{zzmethod(), Ltest.SuperInterface;, ()V, zzmethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8134
			requestor.getResults());
8134
			requestor.getResults());
8135
}
8135
}
8136
8136
Lines 8169-8178 Link Here
8169
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8169
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8170
8170
8171
	assertResults(
8171
	assertResults(
8172
			"zzfield2[FIELD_REF]{zzfield2, Ltest.SuperInterface;, I, zzfield2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8172
			"zzfield2[FIELD_REF]{zzfield2, Ltest.SuperInterface;, I, zzfield2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8173
			"zzfield[FIELD_REF]{zzfield, Ltest.SuperClass;, I, zzfield, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
8173
			"zzfield[FIELD_REF]{zzfield, Ltest.SuperClass;, I, zzfield, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
8174
			"zzmethod[METHOD_REF]{zzmethod(), Ltest.SuperClass;, ()V, zzmethod, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
8174
			"zzmethod[METHOD_REF]{zzmethod(), Ltest.SuperClass;, ()V, zzmethod, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
8175
			"zzmethod2[METHOD_REF]{zzmethod2(), Ltest.SuperInterface;, ()V, zzmethod2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8175
			"zzmethod2[METHOD_REF]{zzmethod2(), Ltest.SuperInterface;, ()V, zzmethod2, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8176
			requestor.getResults());
8176
			requestor.getResults());
8177
}
8177
}
8178
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=120522
8178
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=120522
Lines 8208-8214 Link Here
8208
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8208
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8209
8209
8210
	assertResults(
8210
	assertResults(
8211
			"MyEnum[TYPE_REF]{MyEnum, test, Ltest.MyEnum;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
8211
			"MyEnum[TYPE_REF]{MyEnum, test, Ltest.MyEnum;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
8212
			requestor.getResults());
8212
			requestor.getResults());
8213
}
8213
}
8214
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=127323
8214
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=127323
Lines 8265-8275 Link Here
8265
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8265
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8266
8266
8267
	assertResults(
8267
	assertResults(
8268
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test<TT;TU;TTU;>;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8268
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test<TT;TU;TTU;>;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8269
			"foo[METHOD_DECLARATION]{public <V, W, TU2> V foo(test.SuperTest<V> t, test.SuperTest<W> u, test.SuperTest<TU2> tu, test.SuperTest<T> e), " +
8269
			"foo[METHOD_DECLARATION]{public <V, W, TU2> V foo(test.SuperTest<V> t, test.SuperTest<W> u, test.SuperTest<TU2> tu, test.SuperTest<T> e), " +
8270
				"Ltest.SuperTest<TT;>;, <V:Ljava.lang.Object;W:Ljava.lang.Object;TU2:Ljava.lang.Object;>(Ltest.SuperTest<TV;>;Ltest.SuperTest<TW;>;" +
8270
				"Ltest.SuperTest<TT;>;, <V:Ljava.lang.Object;W:Ljava.lang.Object;TU2:Ljava.lang.Object;>(Ltest.SuperTest<TV;>;Ltest.SuperTest<TW;>;" +
8271
				"Ltest.SuperTest<TTU2;>;Ltest.SuperTest<TT;>;)TV;, foo, (t, u, tu, e), " +
8271
				"Ltest.SuperTest<TTU2;>;Ltest.SuperTest<TT;>;)TV;, foo, (t, u, tu, e), " +
8272
				(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8272
				(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8273
			requestor.getResults());
8273
			requestor.getResults());
8274
}
8274
}
8275
8275
Lines 8298-8307 Link Here
8298
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8298
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8299
8299
8300
	assertResults(
8300
	assertResults(
8301
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test<TT;TU;TTU;>;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8301
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test<TT;TU;TTU;>;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8302
			"foo[METHOD_DECLARATION]{public Object foo(SuperTest t, SuperTest u, SuperTest tu, SuperTest e), Ltest.SuperTest;, (Ltest.SuperTest;" +
8302
			"foo[METHOD_DECLARATION]{public Object foo(SuperTest t, SuperTest u, SuperTest tu, SuperTest e), Ltest.SuperTest;, (Ltest.SuperTest;" +
8303
				"Ltest.SuperTest;Ltest.SuperTest;Ltest.SuperTest;)Ljava.lang.Object;, foo, (t, u, tu, e), " +
8303
				"Ltest.SuperTest;Ltest.SuperTest;Ltest.SuperTest;)Ljava.lang.Object;, foo, (t, u, tu, e), " +
8304
				(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8304
				(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8305
			requestor.getResults());
8305
			requestor.getResults());
8306
}
8306
}
8307
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=128169
8307
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=128169
Lines 8329-8337 Link Here
8329
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8329
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8330
8330
8331
	assertResults(
8331
	assertResults(
8332
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test<TT;TU;TTU;>;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8332
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test<TT;TU;TTU;>;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8333
			"foo[METHOD_DECLARATION]{public <V, W, TU2> V foo(V t, W u, TU2 tu), Ltest.SuperTest;, <V:Ljava.lang.Object;W:Ljava.lang.Object;TU2:Ljava.lang.Object;>(TV;TW;TTU2;)TV;, foo, (t, u, tu), " +
8333
			"foo[METHOD_DECLARATION]{public <V, W, TU2> V foo(V t, W u, TU2 tu), Ltest.SuperTest;, <V:Ljava.lang.Object;W:Ljava.lang.Object;TU2:Ljava.lang.Object;>(TV;TW;TTU2;)TV;, foo, (t, u, tu), " +
8334
				(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8334
				(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8335
			requestor.getResults());
8335
			requestor.getResults());
8336
}
8336
}
8337
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=131681
8337
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=131681
Lines 8359-8366 Link Here
8359
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8359
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8360
8360
8361
	assertResults(
8361
	assertResults(
8362
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test;, ()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8362
			"foo[POTENTIAL_METHOD_DECLARATION]{foo, Ltest.Test;, ()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8363
			"foo[METHOD_DECLARATION]{public <T> void foo(), Ltest.SuperTest;, <T:Ljava.lang.Object;>()V, foo, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8363
			"foo[METHOD_DECLARATION]{public <T> void foo(), Ltest.SuperTest;, <T:Ljava.lang.Object;>()V, foo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_METHOD_OVERIDE + R_NON_RESTRICTED) + "}",
8364
			requestor.getResults());
8364
			requestor.getResults());
8365
}
8365
}
8366
public void test0270() throws JavaModelException {
8366
public void test0270() throws JavaModelException {
Lines 8391-8398 Link Here
8391
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8391
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8392
8392
8393
	assertResults(
8393
	assertResults(
8394
			"Test270_2[TYPE_REF]{Test270_2, test, Ltest.Test270_2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8394
			"Test270_2[TYPE_REF]{Test270_2, test, Ltest.Test270_2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
8395
			"Test270[TYPE_REF]{Test270, test, Ltest.Test270;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
8395
			"Test270[TYPE_REF]{Test270, test, Ltest.Test270;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXPECTED_TYPE + R_UNQUALIFIED + R_EXACT_NAME + R_NON_RESTRICTED) + "}",
8396
			requestor.getResults());
8396
			requestor.getResults());
8397
}
8397
}
8398
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8398
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8423-8429 Link Here
8423
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8423
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8424
8424
8425
	assertResults(
8425
	assertResults(
8426
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8426
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8427
			requestor.getResults());
8427
			requestor.getResults());
8428
}
8428
}
8429
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8429
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8454-8461 Link Here
8454
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8454
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8455
8455
8456
	assertResults(
8456
	assertResults(
8457
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8457
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8458
			"zzz1[METHOD_REF]{zzz1(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz1, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8458
			"zzz1[METHOD_REF]{zzz1(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz1, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8459
			requestor.getResults());
8459
			requestor.getResults());
8460
}
8460
}
8461
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8461
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8489-8496 Link Here
8489
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8489
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8490
8490
8491
	assertResults(
8491
	assertResults(
8492
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8492
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}\n" +
8493
			"zzz1[METHOD_REF]{zzz1(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz1, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8493
			"zzz1[METHOD_REF]{zzz1(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz1, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8494
			requestor.getResults());
8494
			requestor.getResults());
8495
}
8495
}
8496
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8496
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8642-8648 Link Here
8642
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8642
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8643
8643
8644
	assertResults(
8644
	assertResults(
8645
			"zzz2[METHOD_REF]{zzz2(), Ltest.Test;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8645
			"zzz2[METHOD_REF]{zzz2(), Ltest.Test;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8646
			requestor.getResults());
8646
			requestor.getResults());
8647
}
8647
}
8648
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8648
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8673-8679 Link Here
8673
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8673
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8674
8674
8675
	assertResults(
8675
	assertResults(
8676
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8676
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8677
			requestor.getResults());
8677
			requestor.getResults());
8678
}
8678
}
8679
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8679
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8735-8741 Link Here
8735
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8735
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8736
8736
8737
	assertResults(
8737
	assertResults(
8738
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, <T:Ljava.lang.Object;>(TT;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8738
			"zzz2[METHOD_REF]{zzz2(), Ltest.TestCollections;, <T:Ljava.lang.Object;>(TT;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8739
			requestor.getResults());
8739
			requestor.getResults());
8740
}
8740
}
8741
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
8741
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=106450
Lines 8816-8822 Link Here
8816
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8816
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8817
8817
8818
	assertResults(
8818
	assertResults(
8819
			"zzz2[METHOD_REF]{zzz2(), Ltest.Test;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8819
			"zzz2[METHOD_REF]{zzz2(), Ltest.Test;, (Ljava.lang.Object;)V, zzz2, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_INHERITED + R_NON_RESTRICTED) + "}",
8820
			requestor.getResults());
8820
			requestor.getResults());
8821
}
8821
}
8822
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=133491
8822
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=133491
Lines 8855-8861 Link Here
8855
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8855
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8856
8856
8857
	assertResults(
8857
	assertResults(
8858
			"ZZZNeedsImportEnum[TYPE_REF]{ZZZNeedsImportEnum, pack, Lpack.ZZZNeedsImportEnum;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
8858
			"ZZZNeedsImportEnum[TYPE_REF]{ZZZNeedsImportEnum, pack, Lpack.ZZZNeedsImportEnum;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
8859
			requestor.getResults());
8859
			requestor.getResults());
8860
}
8860
}
8861
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95829
8861
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95829
Lines 8892-8898 Link Here
8892
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8892
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8893
8893
8894
	assertResults(
8894
	assertResults(
8895
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ljava.lang.Object;>;, <T:Ljava.lang.Object;>([TT;)[TT;, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8895
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ljava.lang.Object;>;, <T:Ljava.lang.Object;>([TT;)[TT;, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
8896
			requestor.getResults());
8896
			requestor.getResults());
8897
}
8897
}
8898
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95829
8898
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=95829
Lines 8927-8934 Link Here
8927
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8927
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8928
8928
8929
	assertResults(
8929
	assertResults(
8930
			"fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.Test;, ()V, fo, null, " + (R_DEFAULT + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8930
			"fo[POTENTIAL_METHOD_DECLARATION]{fo, Ltest.Test;, ()V, fo, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_NON_RESTRICTED) + "}\n" +
8931
			"foo[METHOD_DECLARATION]{public <T> T[] foo(T[] t), Ltest.Test2<Ljava.lang.Object;>;, <T:Ljava.lang.Object;>([TT;)[TT;, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_ABSTRACT_METHOD + R_NON_RESTRICTED) + "}",
8931
			"foo[METHOD_DECLARATION]{public <T> T[] foo(T[] t), Ltest.Test2<Ljava.lang.Object;>;, <T:Ljava.lang.Object;>([TT;)[TT;, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_METHOD_OVERIDE + R_ABSTRACT_METHOD + R_NON_RESTRICTED) + "}",
8932
			requestor.getResults());
8932
			requestor.getResults());
8933
}
8933
}
8934
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97085
8934
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97085
Lines 8954-8960 Link Here
8954
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8954
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8955
8955
8956
	assertResults(
8956
	assertResults(
8957
			"test0.test1[PACKAGE_REF]{test0.test1.*;, test0.test1, null, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8957
			"test0.test1[PACKAGE_REF]{test0.test1.*;, test0.test1, null, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8958
			requestor.getResults());
8958
			requestor.getResults());
8959
}
8959
}
8960
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97085
8960
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=97085
Lines 8980-8986 Link Here
8980
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8980
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
8981
8981
8982
	assertResults(
8982
	assertResults(
8983
			"test0.test1[PACKAGE_REF]{test0.test1., test0.test1, null, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8983
			"test0.test1[PACKAGE_REF]{test0.test1., test0.test1, null, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_RESTRICTED) + "}",
8984
			requestor.getResults());
8984
			requestor.getResults());
8985
}
8985
}
8986
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=129983
8986
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=129983
Lines 9007-9013 Link Here
9007
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9007
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9008
9008
9009
	assertResults(
9009
	assertResults(
9010
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
9010
			"QQAnnotation[TYPE_REF]{pkgannotations.QQAnnotation, pkgannotations, Lpkgannotations.QQAnnotation;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_ANNOTATION + R_NON_RESTRICTED) + "}",
9011
			requestor.getResults());
9011
			requestor.getResults());
9012
}
9012
}
9013
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225
9013
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225
Lines 9055-9061 Link Here
9055
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9055
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9056
9056
9057
	assertResults(
9057
	assertResults(
9058
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ltest.Test4;>;, (Ltest.Test3;)V, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9058
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ltest.Test4;>;, (Ltest.Test3;)V, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9059
			requestor.getResults());
9059
			requestor.getResults());
9060
}
9060
}
9061
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225
9061
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225
Lines 9110-9117 Link Here
9110
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9110
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9111
9111
9112
	assertResults(
9112
	assertResults(
9113
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ltest.Test4;>;, (Ltest.Test3;)V, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
9113
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ltest.Test4;>;, (Ltest.Test3;)V, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}\n" +
9114
			"foo[METHOD_REF]{foo(), Ltest.Test5;, (Ltest.Test4;)V, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9114
			"foo[METHOD_REF]{foo(), Ltest.Test5;, (Ltest.Test4;)V, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9115
			requestor.getResults());
9115
			requestor.getResults());
9116
}
9116
}
9117
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225
9117
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=123225
Lines 9160-9167 Link Here
9160
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9160
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9161
9161
9162
	assertResults(
9162
	assertResults(
9163
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ltest.Test4;>;, (Ltest.Test3;)V, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
9163
			"foo[METHOD_REF]{foo(), Ltest.Test2<Ltest.Test4;>;, (Ltest.Test3;)V, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
9164
			"foo[METHOD_REF]{foo(), Ltest.Test;, (Ltest.Test4;)V, foo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
9164
			"foo[METHOD_REF]{foo(), Ltest.Test;, (Ltest.Test4;)V, foo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
9165
			requestor.getResults());
9165
			requestor.getResults());
9166
}
9166
}
9167
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=161557
9167
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=161557
Lines 9193-9199 Link Here
9193
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9193
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9194
9194
9195
	assertResults(
9195
	assertResults(
9196
			"Test2[TYPE_REF]{Test2, test, Ltest.Test2;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
9196
			"Test2[TYPE_REF]{Test2, test, Ltest.Test2;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
9197
			requestor.getResults());
9197
			requestor.getResults());
9198
}
9198
}
9199
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=99928
9199
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=99928
Lines 9250-9256 Link Here
9250
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9250
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9251
9251
9252
	assertResults(
9252
	assertResults(
9253
			"compareTo[METHOD_REF]{compareTo, Ltest.ComparableTest<!*>;, (!*)I, compareTo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9253
			"compareTo[METHOD_REF]{compareTo, Ltest.ComparableTest<!*>;, (!*)I, compareTo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9254
			requestor.getResults());
9254
			requestor.getResults());
9255
}
9255
}
9256
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=99928
9256
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=99928
Lines 9305-9311 Link Here
9305
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9305
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9306
9306
9307
	assertResults(
9307
	assertResults(
9308
			"compareTo[METHOD_REF]{compareTo(), Ltest.ComparableTest<!*>;, (!*)I, compareTo, (t), " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9308
			"compareTo[METHOD_REF]{compareTo(), Ltest.ComparableTest<!*>;, (!*)I, compareTo, (t), " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9309
			requestor.getResults());
9309
			requestor.getResults());
9310
}
9310
}
9311
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154993
9311
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=154993
Lines 9362-9368 Link Here
9362
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9362
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9363
9363
9364
	assertResults(
9364
	assertResults(
9365
			"clone[METHOD_REF]{clone(), [Ltest.ZZZ;, ()[Ltest.ZZZ;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9365
			"clone[METHOD_REF]{clone(), [Ltest.ZZZ;, ()[Ltest.ZZZ;, clone, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9366
			requestor.getResults());
9366
			requestor.getResults());
9367
}
9367
}
9368
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164792
9368
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=164792
Lines 9390-9396 Link Here
9390
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9390
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9391
9391
9392
	assertResults(
9392
	assertResults(
9393
			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9393
			"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_NON_STATIC + R_NON_RESTRICTED) + "}",
9394
			requestor.getResults());
9394
			requestor.getResults());
9395
}
9395
}
9396
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
9396
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=157584
Lines 9434-9440 Link Here
9434
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9434
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9435
9435
9436
	assertResults(
9436
	assertResults(
9437
			"Top<java.lang.Object>.IZZException[TYPE_REF]{test.Top.IZZException, test, Ltest.Top<Ljava.lang.Object;>.IZZException;, null, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
9437
			"Top<java.lang.Object>.IZZException[TYPE_REF]{test.Top.IZZException, test, Ltest.Top<Ljava.lang.Object;>.IZZException;, null, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXCEPTION + R_EXACT_EXPECTED_TYPE + R_NON_RESTRICTED) + "}",
9438
			requestor.getResults());
9438
			requestor.getResults());
9439
}
9439
}
9440
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=153130
9440
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=153130
Lines 9466-9472 Link Here
9466
            requestor.getContext());
9466
            requestor.getContext());
9467
    
9467
    
9468
	assertResults(
9468
	assertResults(
9469
			"Test<T>[TYPE_REF]{, test, Ltest.Test<TT;>;, null, null, ["+startOffset+", "+endOffset+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
9469
			"Test<T>[TYPE_REF]{, test, Ltest.Test<TT;>;, null, null, ["+startOffset+", "+endOffset+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_EXPECTED_TYPE + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
9470
			requestor.getResults());
9470
			requestor.getResults());
9471
}
9471
}
9472
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
9472
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 9497-9503 Link Here
9497
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9497
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9498
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9498
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9499
9499
9500
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9500
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9501
	int start1 = str.lastIndexOf("foo") + "".length();
9501
	int start1 = str.lastIndexOf("foo") + "".length();
9502
	int end1 = start1 + "foo".length();
9502
	int end1 = start1 + "foo".length();
9503
	int start2 = str.lastIndexOf("public class");
9503
	int start2 = str.lastIndexOf("public class");
Lines 9535-9541 Link Here
9535
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9535
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9536
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9536
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9537
	
9537
	
9538
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9538
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9539
	int start1 = str.lastIndexOf("foo") + "".length();
9539
	int start1 = str.lastIndexOf("foo") + "".length();
9540
	int end1 = start1 + "foo".length();
9540
	int end1 = start1 + "foo".length();
9541
	int start2 = str.lastIndexOf("public class");
9541
	int start2 = str.lastIndexOf("public class");
Lines 9637-9643 Link Here
9637
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9637
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9638
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9638
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9639
	
9639
	
9640
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9640
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9641
	int start1 = str.lastIndexOf("foo") + "".length();
9641
	int start1 = str.lastIndexOf("foo") + "".length();
9642
	int end1 = start1 + "foo".length();
9642
	int end1 = start1 + "foo".length();
9643
	int start2 = str.lastIndexOf("public class");
9643
	int start2 = str.lastIndexOf("public class");
Lines 9675-9681 Link Here
9675
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9675
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9676
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9676
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9677
9677
9678
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9678
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9679
	int start1 = str.lastIndexOf("foo") + "".length();
9679
	int start1 = str.lastIndexOf("foo") + "".length();
9680
	int end1 = start1 + "foo".length();
9680
	int end1 = start1 + "foo".length();
9681
	int start2 = str.lastIndexOf("public class");
9681
	int start2 = str.lastIndexOf("public class");
Lines 9714-9720 Link Here
9714
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9714
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9715
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9715
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9716
9716
9717
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9717
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9718
	int start1 = str.lastIndexOf("foo") + "".length();
9718
	int start1 = str.lastIndexOf("foo") + "".length();
9719
	int end1 = start1 + "foo".length();
9719
	int end1 = start1 + "foo".length();
9720
	int start2 = str.lastIndexOf("public class");
9720
	int start2 = str.lastIndexOf("public class");
Lines 9756-9762 Link Here
9756
	int start1 = str.lastIndexOf("foo") + "".length();
9756
	int start1 = str.lastIndexOf("foo") + "".length();
9757
	int end1 = start1 + "foo".length();
9757
	int end1 = start1 + "foo".length();
9758
	assertResults(
9758
	assertResults(
9759
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9759
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9760
			requestor.getResults());
9760
			requestor.getResults());
9761
}
9761
}
9762
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
9762
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 9788-9794 Link Here
9788
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9788
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9789
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9789
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9790
9790
9791
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9791
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9792
	int start1 = str.lastIndexOf("foo") + "".length();
9792
	int start1 = str.lastIndexOf("foo") + "".length();
9793
	int end1 = start1 + "foo".length();
9793
	int end1 = start1 + "foo".length();
9794
	int start2 = str.lastIndexOf("public class");
9794
	int start2 = str.lastIndexOf("public class");
Lines 9830-9836 Link Here
9830
	int start1 = str.lastIndexOf("foo") + "".length();
9830
	int start1 = str.lastIndexOf("foo") + "".length();
9831
	int end1 = start1 + "foo".length();
9831
	int end1 = start1 + "foo".length();
9832
	assertResults(
9832
	assertResults(
9833
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9833
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9834
			requestor.getResults());
9834
			requestor.getResults());
9835
}
9835
}
9836
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
9836
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 9862-9868 Link Here
9862
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9862
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9863
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9863
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9864
9864
9865
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9865
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9866
	int start1 = str.lastIndexOf("foo") + "".length();
9866
	int start1 = str.lastIndexOf("foo") + "".length();
9867
	int end1 = start1 + "foo".length();
9867
	int end1 = start1 + "foo".length();
9868
	int start2 = str.lastIndexOf("public class");
9868
	int start2 = str.lastIndexOf("public class");
Lines 9904-9910 Link Here
9904
	int start1 = str.lastIndexOf("foo") + "".length();
9904
	int start1 = str.lastIndexOf("foo") + "".length();
9905
	int end1 = start1 + "foo".length();
9905
	int end1 = start1 + "foo".length();
9906
	assertResults(
9906
	assertResults(
9907
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9907
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9908
			requestor.getResults());
9908
			requestor.getResults());
9909
}
9909
}
9910
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
9910
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 9936-9942 Link Here
9936
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9936
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
9937
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9937
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
9938
9938
9939
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9939
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
9940
	int start1 = str.lastIndexOf("foo") + "".length();
9940
	int start1 = str.lastIndexOf("foo") + "".length();
9941
	int end1 = start1 + "foo".length();
9941
	int end1 = start1 + "foo".length();
9942
	int start2 = str.lastIndexOf("public class");
9942
	int start2 = str.lastIndexOf("public class");
Lines 9978-9984 Link Here
9978
	int start1 = str.lastIndexOf("foo") + "".length();
9978
	int start1 = str.lastIndexOf("foo") + "".length();
9979
	int end1 = start1 + "foo".length();
9979
	int end1 = start1 + "foo".length();
9980
	assertResults(
9980
	assertResults(
9981
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9981
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED +R_NON_RESTRICTED)+"}",
9982
			requestor.getResults());
9982
			requestor.getResults());
9983
}
9983
}
9984
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
9984
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 10020-10026 Link Here
10020
	int start1 = str.lastIndexOf("foo") + "".length();
10020
	int start1 = str.lastIndexOf("foo") + "".length();
10021
	int end1 = start1 + "foo".length();
10021
	int end1 = start1 + "foo".length();
10022
	assertResults(
10022
	assertResults(
10023
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10023
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10024
			requestor.getResults());
10024
			requestor.getResults());
10025
}
10025
}
10026
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
10026
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 10053-10059 Link Here
10053
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10053
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10054
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10054
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10055
	
10055
	
10056
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10056
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10057
	int start1 = str.lastIndexOf("foo") + "".length();
10057
	int start1 = str.lastIndexOf("foo") + "".length();
10058
	int end1 = start1 + "foo".length();
10058
	int end1 = start1 + "foo".length();
10059
	int start2 = str.lastIndexOf("public class Test");
10059
	int start2 = str.lastIndexOf("public class Test");
Lines 10061-10067 Link Here
10061
	assertResults(
10061
	assertResults(
10062
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (relevance1) + "}\n" +
10062
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], " + (relevance1) + "}\n" +
10063
			"   foo[METHOD_IMPORT]{import static test.p.ZZZ.foo;\n, Ltest.p.ZZZ;, ()I, foo, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n" +
10063
			"   foo[METHOD_IMPORT]{import static test.p.ZZZ.foo;\n, Ltest.p.ZZZ;, ()I, foo, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n" +
10064
			"Test.foo[TYPE_REF]{foo, test, Ltest.Test$foo;, null, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10064
			"Test.foo[TYPE_REF]{foo, test, Ltest.Test$foo;, null, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10065
			requestor.getResults());
10065
			requestor.getResults());
10066
}
10066
}
10067
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
10067
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 10095-10101 Link Here
10095
	int start1 = str.lastIndexOf("foo") + "".length();
10095
	int start1 = str.lastIndexOf("foo") + "".length();
10096
	int end1 = start1 + "foo".length();
10096
	int end1 = start1 + "foo".length();
10097
	assertResults(
10097
	assertResults(
10098
			"foo[METHOD_REF]{foo(), Ltest.Test;, ()V, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10098
			"foo[METHOD_REF]{foo(), Ltest.Test;, ()V, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10099
			requestor.getResults());
10099
			requestor.getResults());
10100
}
10100
}
10101
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
10101
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 10127-10133 Link Here
10127
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10127
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10128
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10128
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10129
10129
10130
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10130
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10131
	int start1 = str.lastIndexOf("foo") + "".length();
10131
	int start1 = str.lastIndexOf("foo") + "".length();
10132
	int end1 = start1 + "foo".length();
10132
	int end1 = start1 + "foo".length();
10133
	int start2 = str.lastIndexOf("public class");
10133
	int start2 = str.lastIndexOf("public class");
Lines 10135-10141 Link Here
10135
	assertResults(
10135
	assertResults(
10136
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
10136
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
10137
			"   foo[METHOD_IMPORT]{import static test.p.ZZZ.foo;\n, Ltest.p.ZZZ;, ()I, foo, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
10137
			"   foo[METHOD_IMPORT]{import static test.p.ZZZ.foo;\n, Ltest.p.ZZZ;, ()I, foo, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
10138
			"foo[FIELD_REF]{foo, Ltest.Test;, I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10138
			"foo[FIELD_REF]{foo, Ltest.Test;, I, foo, null, ["+start1+", "+end1+"], " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10139
			requestor.getResults());
10139
			requestor.getResults());
10140
}
10140
}
10141
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
10141
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 10167-10173 Link Here
10167
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10167
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10168
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10168
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10169
10169
10170
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10170
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10171
	int start1 = str.lastIndexOf("foo") + "".length();
10171
	int start1 = str.lastIndexOf("foo") + "".length();
10172
	int end1 = start1 + "foo".length();
10172
	int end1 = start1 + "foo".length();
10173
	int start2 = str.lastIndexOf("public class");
10173
	int start2 = str.lastIndexOf("public class");
Lines 10175-10181 Link Here
10175
	assertResults(
10175
	assertResults(
10176
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
10176
			"foo[METHOD_REF]{foo(), Ltest.p.ZZZ;, ()I, foo, null, ["+start1+", "+end1+"], "+(relevance1)+"}\n" +
10177
			"   foo[METHOD_IMPORT]{import static test.p.ZZZ.foo;\n, Ltest.p.ZZZ;, ()I, foo, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
10177
			"   foo[METHOD_IMPORT]{import static test.p.ZZZ.foo;\n, Ltest.p.ZZZ;, ()I, foo, null, ["+start2+", "+end2+"], " + (relevance1) + "}\n"+
10178
			"foo[LOCAL_VARIABLE_REF]{foo, null, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10178
			"foo[LOCAL_VARIABLE_REF]{foo, null, I, foo, null, ["+start1+", "+end1+"], "+(R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_UNQUALIFIED + R_NON_RESTRICTED)+"}",
10179
			requestor.getResults());
10179
			requestor.getResults());
10180
}
10180
}
10181
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
10181
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=152123
Lines 10207-10213 Link Here
10207
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10207
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10208
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10208
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10209
10209
10210
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10210
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10211
	int start1 = str.lastIndexOf("foo") + "".length();
10211
	int start1 = str.lastIndexOf("foo") + "".length();
10212
	int end1 = start1 + "foo".length();
10212
	int end1 = start1 + "foo".length();
10213
	int start2 = str.lastIndexOf("public class");
10213
	int start2 = str.lastIndexOf("public class");
Lines 10247-10253 Link Here
10247
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10247
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10248
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10248
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10249
10249
10250
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10250
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10251
	int start1 = str.lastIndexOf("foo") + "".length();
10251
	int start1 = str.lastIndexOf("foo") + "".length();
10252
	int end1 = start1 + "foo".length();
10252
	int end1 = start1 + "foo".length();
10253
	int start2 = str.lastIndexOf("public class");
10253
	int start2 = str.lastIndexOf("public class");
Lines 10318-10324 Link Here
10318
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10318
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10319
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10319
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10320
10320
10321
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10321
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10322
	int start1 = str.lastIndexOf("foo") + "".length();
10322
	int start1 = str.lastIndexOf("foo") + "".length();
10323
	int end1 = start1 + "foo".length();
10323
	int end1 = start1 + "foo".length();
10324
	int start2 = str.lastIndexOf("/** */");
10324
	int start2 = str.lastIndexOf("/** */");
Lines 10485-10491 Link Here
10485
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10485
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10486
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10486
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10487
10487
10488
	int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10488
	int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10489
	int start1 = str.lastIndexOf("foo") + "".length();
10489
	int start1 = str.lastIndexOf("foo") + "".length();
10490
	int end1 = start1 + "foo".length();
10490
	int end1 = start1 + "foo".length();
10491
	int start2 = str.lastIndexOf("public class");
10491
	int start2 = str.lastIndexOf("public class");
Lines 10530-10536 Link Here
10530
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10530
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10531
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10531
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10532
		
10532
		
10533
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10533
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10534
		int start1 = str.lastIndexOf("foo") + "".length();
10534
		int start1 = str.lastIndexOf("foo") + "".length();
10535
		int end1 = start1 + "foo".length();
10535
		int end1 = start1 + "foo".length();
10536
		int start2 = str.lastIndexOf("public class");
10536
		int start2 = str.lastIndexOf("public class");
Lines 10578-10584 Link Here
10578
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10578
		int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10579
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10579
		this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10580
		
10580
		
10581
		int relevance1 = R_DEFAULT + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10581
		int relevance1 = R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_EXACT_NAME + R_NON_RESTRICTED;
10582
		int start1 = str.lastIndexOf("foo") + "".length();
10582
		int start1 = str.lastIndexOf("foo") + "".length();
10583
		int end1 = start1 + "foo".length();
10583
		int end1 = start1 + "foo".length();
10584
		int start2 = str.lastIndexOf("public class");
10584
		int start2 = str.lastIndexOf("public class");
Lines 10591-10594 Link Here
10591
		JavaCore.setOptions(oldOptions);
10591
		JavaCore.setOptions(oldOptions);
10592
	}
10592
	}
10593
}
10593
}
10594
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
10595
public void testNameWithUnresolvedReferences001() throws JavaModelException {
10596
	this.workingCopies = new ICompilationUnit[2];
10597
	this.workingCopies[0] = getWorkingCopy(
10598
			"/Completion/src3/test/Test.java",
10599
			"package test;\n" +
10600
			"public class Test {\n" +
10601
			"   void foo() {\n" +
10602
 			"      {\n" +
10603
 			"         int varzz1 = 0;\n" +
10604
			"         varzz1 = varzz2;\n" +
10605
			"         {\n" +
10606
			"            int varzz3 = 0;\n" +
10607
			"            varzz3 = varzz4;\n" +
10608
			"            int varzz5 = 0;\n" +
10609
			"         }\n" +
10610
			"         {\n" +
10611
			"            varzz1 = varzz5;\n" +
10612
			"         }\n" +
10613
			"         int varzz6 = varzz7;\n" +
10614
			"         @MyAnnot1(/**/varzz\n" +
10615
 			"      }\n" +
10616
10617
			"   }\n" +
10618
			"}\n");
10619
	
10620
	this.workingCopies[1] = getWorkingCopy(
10621
			"/Completion/src3/test/MyAnnot1.java",
10622
			"package test;\n" +
10623
			"public @interface MyAnnot1 {\n" +
10624
			"   String value();\n" +
10625
			"   }\n" +
10626
			"}\n");
10627
	
10628
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
10629
	
10630
	String str = this.workingCopies[0].getSource();
10631
	String completeBehind = "/**/varzz";
10632
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10633
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10634
	
10635
	assertResults(
10636
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10637
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10638
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, Ljava.lang.Object;, varzz5, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10639
			"varzz7[LOCAL_VARIABLE_REF]{varzz7, null, Ljava.lang.Object;, varzz7, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10640
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10641
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, I, varzz6, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10642
			requestor.getResults());
10643
}
10644
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
10645
public void testNameWithUnresolvedReferences002() throws JavaModelException {
10646
	this.workingCopies = new ICompilationUnit[2];
10647
	this.workingCopies[0] = getWorkingCopy(
10648
			"/Completion/src3/test/Test.java",
10649
			"package test;\n" +
10650
			"public class Test {\n" +
10651
			"   void foo() {\n" +
10652
 			"      {\n" +
10653
 			"         int varzz1 = 0;\n" +
10654
			"         varzz1 = varzz2;\n" +
10655
			"         {\n" +
10656
			"            int varzz3 = 0;\n" +
10657
			"            varzz3 = varzz4;\n" +
10658
			"            int varzz5 = 0;\n" +
10659
			"         }\n" +
10660
			"         {\n" +
10661
			"            varzz1 = varzz5;\n" +
10662
			"         }\n" +
10663
			"         int varzz6 = varzz7;\n" +
10664
			"         @MyAnnot1(value=/**/varzz\n" +
10665
 			"      }\n" +
10666
10667
			"   }\n" +
10668
			"}\n");
10669
	
10670
	this.workingCopies[1] = getWorkingCopy(
10671
			"/Completion/src3/test/MyAnnot1.java",
10672
			"package test;\n" +
10673
			"public @interface MyAnnot1 {\n" +
10674
			"   String value();\n" +
10675
			"   }\n" +
10676
			"}\n");
10677
	
10678
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
10679
	
10680
	String str = this.workingCopies[0].getSource();
10681
	String completeBehind = "/**/varzz";
10682
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10683
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10684
	
10685
	assertResults(
10686
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10687
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10688
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, Ljava.lang.Object;, varzz5, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10689
			"varzz7[LOCAL_VARIABLE_REF]{varzz7, null, Ljava.lang.Object;, varzz7, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10690
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10691
			"varzz6[LOCAL_VARIABLE_REF]{varzz6, null, I, varzz6, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10692
			requestor.getResults());
10693
}
10694
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=162865
10695
public void testNameWithUnresolvedReferences003() throws JavaModelException {
10696
	this.workingCopies = new ICompilationUnit[2];
10697
	this.workingCopies[0] = getWorkingCopy(
10698
			"/Completion/src3/test/Test.java",
10699
			"package test;\n" +
10700
			"public class Test {\n" +
10701
			"   void foo() {\n" +
10702
 			"      {\n" +
10703
 			"         int varzz1 = 0;\n" +
10704
			"         varzz1 = varzz2;\n" +
10705
			"         {\n" +
10706
			"            int varzz3 = 0;\n" +
10707
			"            varzz3 = varzz4;\n" +
10708
			"            int varzz5 = 0;\n" +
10709
			"         }\n" +
10710
			"         {\n" +
10711
			"            varzz1 = varzz5;\n" +
10712
			"         }\n" +
10713
			"         new Object() {\n" +
10714
			"            int varzz6 = varzz7;\n" +
10715
			"            @MyAnnot1(/**/varzz\n" +
10716
			"         };\n" +
10717
 			"      }\n" +
10718
10719
			"   }\n" +
10720
			"}\n");
10721
	
10722
	this.workingCopies[1] = getWorkingCopy(
10723
			"/Completion/src3/test/MyAnnot1.java",
10724
			"package test;\n" +
10725
			"public @interface MyAnnot1 {\n" +
10726
			"   String value();\n" +
10727
			"   }\n" +
10728
			"}\n");
10729
	
10730
	CompletionTestsRequestor2 requestor = new CompletionTestsRequestor2(true);
10731
	
10732
	String str = this.workingCopies[0].getSource();
10733
	String completeBehind = "/**/varzz";
10734
	int cursorLocation = str.lastIndexOf(completeBehind) + completeBehind.length();
10735
	this.workingCopies[0].codeComplete(cursorLocation, requestor, this.wcOwner);
10736
	
10737
	assertResults(
10738
			"varzz2[LOCAL_VARIABLE_REF]{varzz2, null, Ljava.lang.Object;, varzz2, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10739
			"varzz4[LOCAL_VARIABLE_REF]{varzz4, null, Ljava.lang.Object;, varzz4, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10740
			"varzz5[LOCAL_VARIABLE_REF]{varzz5, null, Ljava.lang.Object;, varzz5, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10741
			"varzz7[LOCAL_VARIABLE_REF]{varzz7, null, Ljava.lang.Object;, varzz7, null, " + (R_DEFAULT + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}\n" +
10742
			"varzz1[LOCAL_VARIABLE_REF]{varzz1, null, I, varzz1, null, " + (R_DEFAULT + R_RESOLVED + R_INTERESTING + R_CASE + R_UNQUALIFIED + R_NON_RESTRICTED) + "}",
10743
			requestor.getResults());
10744
}
10594
}
10745
}
(-)src/org/eclipse/jdt/core/tests/model/JavadocBugsCompletionModelTest.java (-66 / +66 lines)
Lines 58-69 Link Here
58
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@throws ", 0); // empty token
58
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "@throws ", 0); // empty token
59
	if (CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
59
	if (CompletionEngine.NO_TYPE_COMPLETION_ON_EMPTY_TOKEN) {
60
		assertSortedResults(
60
		assertSortedResults(
61
			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREETE+"}"
61
			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNREETE+"}"
62
		);
62
		);
63
	} else {
63
	} else {
64
		assertSortedResults(
64
		assertSortedResults(
65
			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREETE+"}\n" + 
65
			"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNREETE+"}\n" + 
66
			"BasicTestBugs[TYPE_REF]{BasicTestBugs, javadoc.bugs, Ljavadoc.bugs.BasicTestBugs;, null, null, "+this.positions+R_DICUNR+"}"
66
			"BasicTestBugs[TYPE_REF]{BasicTestBugs, javadoc.bugs, Ljavadoc.bugs.BasicTestBugs;, null, null, "+this.positions+R_DRICUNR+"}"
67
		);
67
		);
68
	}
68
	}
69
}
69
}
Lines 78-85 Link Here
78
		"}\n";
78
		"}\n";
79
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "I");
79
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "I");
80
	assertSortedResults(
80
	assertSortedResults(
81
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DICUNREEET+"}\n" + 
81
		"InterruptedException[TYPE_REF]{InterruptedException, java.lang, Ljava.lang.InterruptedException;, null, null, "+this.positions+R_DRICUNREEET+"}\n" + 
82
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DICUNRE+"}"
82
		"IllegalMonitorStateException[TYPE_REF]{IllegalMonitorStateException, java.lang, Ljava.lang.IllegalMonitorStateException;, null, null, "+this.positions+R_DRICUNRE+"}"
83
	);
83
	);
84
}
84
}
85
public void testBug3270b() throws JavaModelException {
85
public void testBug3270b() throws JavaModelException {
Lines 93-100 Link Here
93
		"}\n";
93
		"}\n";
94
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "Cl");
94
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "Cl");
95
	assertSortedResults(
95
	assertSortedResults(
96
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DICUNRE+"}\n" + 
96
		"CloneNotSupportedException[TYPE_REF]{CloneNotSupportedException, java.lang, Ljava.lang.CloneNotSupportedException;, null, null, "+this.positions+R_DRICUNRE+"}\n" + 
97
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DICUNR+"}"
97
		"Class[TYPE_REF]{Class, java.lang, Ljava.lang.Class;, null, null, "+this.positions+R_DRICUNR+"}"
98
	);
98
	);
99
}
99
}
100
100
Lines 114-122 Link Here
114
		"}\n";
114
		"}\n";
115
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "S", 2); // 2nd occurence
115
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "S", 2); // 2nd occurence
116
	assertSortedResults(
116
	assertSortedResults(
117
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICUNR+"}\n" +
117
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICUNR+"}\n" +
118
		"Serializable[TYPE_REF]{java.io.Serializable, java.io, Ljava.io.Serializable;, null, null, "+this.positions+R_DICNR+"}\n" + 
118
		"Serializable[TYPE_REF]{java.io.Serializable, java.io, Ljava.io.Serializable;, null, null, "+this.positions+R_DRICNR+"}\n" + 
119
		"short[KEYWORD]{short, null, null, short, null, "+this.positions+JAVADOC_RELEVANCE+"}"
119
		"short[KEYWORD]{short, null, null, short, null, "+this.positions+R_DRINR+"}"
120
	);
120
	);
121
}
121
}
122
122
Lines 132-138 Link Here
132
		"}\n";
132
		"}\n";
133
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "thisIsAMethod", 2); // 2nd occurence
133
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "thisIsAMethod", 2); // 2nd occurence
134
	assertResults(
134
	assertResults(
135
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(String), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.String;)V, thisIsAMethod, (param), "+this.positions+R_DICENNRNS+"}"
135
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(String), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.String;)V, thisIsAMethod, (param), "+this.positions+R_DRICENNRNS+"}"
136
	);
136
	);
137
}
137
}
138
138
Lines 148-154 Link Here
148
		"}\n";
148
		"}\n";
149
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "thisIsAMethod(", 2); // 2nd occurence
149
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "thisIsAMethod(", 2); // 2nd occurence
150
	assertResults(
150
	assertResults(
151
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(String), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.String;)V, thisIsAMethod, (param), "+this.positions+R_DICENUNR+"}"
151
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(String), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.String;)V, thisIsAMethod, (param), "+this.positions+R_DRICENUNR+"}"
152
	);
152
	);
153
}
153
}
154
154
Lines 165-172 Link Here
165
		"}\n";
165
		"}\n";
166
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "thisIsAMethod(", 2); // 2nd occurence
166
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "thisIsAMethod(", 2); // 2nd occurence
167
	assertResults(
167
	assertResults(
168
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(Object), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.Object;)V, thisIsAMethod, (str), "+this.positions+R_DICENUNR+"}\n" + 
168
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(Object), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.Object;)V, thisIsAMethod, (str), "+this.positions+R_DRICENUNR+"}\n" + 
169
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(String), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.String;)V, thisIsAMethod, (param), "+this.positions+R_DICENUNR+"}"
169
		"thisIsAMethod[METHOD_REF]{thisIsAMethod(String), Ljavadoc.bugs.BasicTestBugs;, (Ljava.lang.String;)V, thisIsAMethod, (param), "+this.positions+R_DRICENUNR+"}"
170
	);
170
	);
171
}
171
}
172
172
Lines 185-191 Link Here
185
		"}\n";
185
		"}\n";
186
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "to");
186
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "to");
187
	assertSortedResults(
187
	assertSortedResults(
188
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}"
188
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}"
189
	);
189
	);
190
}
190
}
191
191
Lines 211-217 Link Here
211
	};
211
	};
212
	completeInJavadoc(sources, true, "Other", 2);	// 2nd occurrence
212
	completeInJavadoc(sources, true, "Other", 2);	// 2nd occurrence
213
	assertSortedResults(
213
	assertSortedResults(
214
		"OtherType[TYPE_REF]{OtherType, javadoc.tests, Ljavadoc.tests.OtherType;, null, null, "+this.positions+R_DICUNR+"}"
214
		"OtherType[TYPE_REF]{OtherType, javadoc.tests, Ljavadoc.tests.OtherType;, null, null, "+this.positions+R_DRICUNR+"}"
215
	);
215
	);
216
}
216
}
217
public void testBug68757a() throws JavaModelException {
217
public void testBug68757a() throws JavaModelException {
Lines 231-237 Link Here
231
	};
231
	};
232
	completeInJavadoc(sources, true, "Other");
232
	completeInJavadoc(sources, true, "Other");
233
	assertSortedResults(
233
	assertSortedResults(
234
		"OtherType[TYPE_REF]{javadoc.tests.OtherType, javadoc.tests, Ljavadoc.tests.OtherType;, null, null, "+this.positions+R_DICNR+"}"
234
		"OtherType[TYPE_REF]{javadoc.tests.OtherType, javadoc.tests, Ljavadoc.tests.OtherType;, null, null, "+this.positions+R_DRICNR+"}"
235
	);
235
	);
236
}
236
}
237
public void testBug68757b() throws JavaModelException {
237
public void testBug68757b() throws JavaModelException {
Lines 251-257 Link Here
251
	};
251
	};
252
	completeInJavadoc(sources, true, "Other");
252
	completeInJavadoc(sources, true, "Other");
253
	assertSortedResults(
253
	assertSortedResults(
254
		"OtherType[TYPE_REF]{javadoc.tests.OtherType, javadoc.tests, Ljavadoc.tests.OtherType;, null, null, "+this.positions+R_DICNR+"}"
254
		"OtherType[TYPE_REF]{javadoc.tests.OtherType, javadoc.tests, Ljavadoc.tests.OtherType;, null, null, "+this.positions+R_DRICNR+"}"
255
	);
255
	);
256
}
256
}
257
257
Lines 281-287 Link Here
281
	};
281
	};
282
	completeInJavadoc(sources, true, "Inner");
282
	completeInJavadoc(sources, true, "Inner");
283
	assertSortedResults(
283
	assertSortedResults(
284
		"SuperClass.InnerClass[TYPE_REF]{SuperClass.InnerClass, javadoc.bugs, Ljavadoc.bugs.SuperClass$InnerClass;, null, null, "+this.positions+R_DICUNR+"}"
284
		"SuperClass.InnerClass[TYPE_REF]{SuperClass.InnerClass, javadoc.bugs, Ljavadoc.bugs.SuperClass$InnerClass;, null, null, "+this.positions+R_DRICUNR+"}"
285
	);
285
	);
286
}
286
}
287
287
Lines 309-326 Link Here
309
	};
309
	};
310
	completeInJavadoc(sources, true, "#", 0); // empty token
310
	completeInJavadoc(sources, true, "#", 0); // empty token
311
	assertSortedResults(
311
	assertSortedResults(
312
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DICNRNS+"}\n" + 
312
		"clone[METHOD_REF]{clone(), Ljava.lang.Object;, ()Ljava.lang.Object;, clone, null, "+this.positions+R_DRICNRNS+"}\n" + 
313
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DICNRNS+"}\n" + 
313
		"equals[METHOD_REF]{equals(Object), Ljava.lang.Object;, (Ljava.lang.Object;)Z, equals, (obj), "+this.positions+R_DRICNRNS+"}\n" + 
314
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DICNRNS+"}\n" + 
314
		"finalize[METHOD_REF]{finalize(), Ljava.lang.Object;, ()V, finalize, null, "+this.positions+R_DRICNRNS+"}\n" + 
315
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DICNRNS+"}\n" + 
315
		"getClass[METHOD_REF]{getClass(), Ljava.lang.Object;, ()Ljava.lang.Class;, getClass, null, "+this.positions+R_DRICNRNS+"}\n" + 
316
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DICNRNS+"}\n" + 
316
		"hashCode[METHOD_REF]{hashCode(), Ljava.lang.Object;, ()I, hashCode, null, "+this.positions+R_DRICNRNS+"}\n" + 
317
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DICNRNS+"}\n" + 
317
		"notify[METHOD_REF]{notify(), Ljava.lang.Object;, ()V, notify, null, "+this.positions+R_DRICNRNS+"}\n" + 
318
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DICNRNS+"}\n" + 
318
		"notifyAll[METHOD_REF]{notifyAll(), Ljava.lang.Object;, ()V, notifyAll, null, "+this.positions+R_DRICNRNS+"}\n" + 
319
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
319
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
320
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DICNRNS+"}\n" + 
320
		"wait[METHOD_REF]{wait(long, int), Ljava.lang.Object;, (JI)V, wait, (millis, nanos), "+this.positions+R_DRICNRNS+"}\n" + 
321
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DICNRNS+"}\n" + 
321
		"wait[METHOD_REF]{wait(long), Ljava.lang.Object;, (J)V, wait, (millis), "+this.positions+R_DRICNRNS+"}\n" + 
322
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DICNRNS+"}\n" + 
322
		"wait[METHOD_REF]{wait(), Ljava.lang.Object;, ()V, wait, null, "+this.positions+R_DRICNRNS+"}\n" + 
323
		"Terminator[METHOD_REF<CONSTRUCTOR>]{Terminator(), Ljavadoc.bugs.Terminator;, ()V, Terminator, null, "+this.positions+JAVADOC_RELEVANCE+"}"
323
		"Terminator[METHOD_REF<CONSTRUCTOR>]{Terminator(), Ljavadoc.bugs.Terminator;, ()V, Terminator, null, "+this.positions+R_DRINR+"}"
324
	);
324
	);
325
}
325
}
326
326
Lines 340-346 Link Here
340
		"}";
340
		"}";
341
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "meth");
341
	completeInJavadoc("/Completion/src/javadoc/bugs/BasicTestBugs.java", source, true, "meth");
342
	assertSortedResults(
342
	assertSortedResults(
343
		"method[METHOD_REF]{method(Object), Ljavadoc.bugs.BasicTestBugs<TS;>;, (TS;)V, method, (s), "+this.positions+R_DICNRNS+"}"
343
		"method[METHOD_REF]{method(Object), Ljavadoc.bugs.BasicTestBugs<TS;>;, (TS;)V, method, (s), "+this.positions+R_DRICNRNS+"}"
344
	);
344
	);
345
}
345
}
346
346
Lines 396-402 Link Here
396
	};
396
	};
397
	completeInJavadoc(sources, true, "javadoc.util.Collection");
397
	completeInJavadoc(sources, true, "javadoc.util.Collection");
398
	assertSortedResults(
398
	assertSortedResults(
399
		"Collection[TYPE_REF]{javadoc.util.Collection, javadoc.util, Ljavadoc.util.Collection;, null, null, "+this.positions+R_DICENQNR+"}"
399
		"Collection[TYPE_REF]{javadoc.util.Collection, javadoc.util, Ljavadoc.util.Collection;, null, null, "+this.positions+R_DRICENQNR+"}"
400
	);
400
	);
401
}
401
}
402
public void testBug113376b() throws JavaModelException {
402
public void testBug113376b() throws JavaModelException {
Lines 440-447 Link Here
440
		"}\n";
440
		"}\n";
441
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Secondary.Mem");
441
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Secondary.Mem");
442
	assertSortedResults(
442
	assertSortedResults(
443
		"Secondary.Member[JAVADOC_TYPE_REF]{{@link Member}, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNRIT+"}\n" + 
443
		"Secondary.Member[JAVADOC_TYPE_REF]{{@link Member}, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNRIT+"}\n" + 
444
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNR+"}"
444
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNR+"}"
445
	);
445
	);
446
}
446
}
447
447
Lines 459-465 Link Here
459
		"}\n";
459
		"}\n";
460
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
460
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
461
	assertSortedResults(
461
	assertSortedResults(
462
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNR+"}"
462
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNR+"}"
463
	);
463
	);
464
}
464
}
465
465
Lines 477-483 Link Here
477
		"}\n";
477
		"}\n";
478
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
478
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
479
	assertSortedResults(
479
	assertSortedResults(
480
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNR+"}"
480
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNR+"}"
481
	);
481
	);
482
}
482
}
483
public void testBug114341d() throws JavaModelException {
483
public void testBug114341d() throws JavaModelException {
Lines 494-501 Link Here
494
		"}\n";
494
		"}\n";
495
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.Secondary.Mem");
495
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "javadoc.text.Secondary.Mem");
496
	assertSortedResults(
496
	assertSortedResults(
497
		"Secondary.Member[JAVADOC_TYPE_REF]{{@link Member}, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNRIT+"}\n" + 
497
		"Secondary.Member[JAVADOC_TYPE_REF]{{@link Member}, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNRIT+"}\n" + 
498
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNR+"}"
498
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNR+"}"
499
	);
499
	);
500
}
500
}
501
501
Lines 513-519 Link Here
513
		"}\n";
513
		"}\n";
514
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
514
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
515
	assertSortedResults(
515
	assertSortedResults(
516
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNR+"}"
516
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNR+"}"
517
	);
517
	);
518
}
518
}
519
519
Lines 531-537 Link Here
531
		"}\n";
531
		"}\n";
532
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
532
	completeInJavadoc("/Completion/src/javadoc/text/BasicTestTextIns.java", source, true, "Mem");
533
	assertSortedResults(
533
	assertSortedResults(
534
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DICNR+"}"
534
		"Secondary.Member[TYPE_REF]{Member, javadoc.text, Ljavadoc.text.Secondary$Member;, null, null, "+this.positions+R_DRICNR+"}"
535
	);
535
	);
536
}
536
}
537
537
Lines 550-557 Link Here
550
		"}\n";
550
		"}\n";
551
	completeInJavadoc("/Completion/src/bugs/b115662/Test.java", source, true, "to");
551
	completeInJavadoc("/Completion/src/bugs/b115662/Test.java", source, true, "to");
552
	assertSortedResults(
552
	assertSortedResults(
553
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
553
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
554
		"toto[FIELD_REF]{toto, Lbugs.b115662.Tests;, I, toto, null, "+this.positions+R_DICNRNS+"}"
554
		"toto[FIELD_REF]{toto, Lbugs.b115662.Tests;, I, toto, null, "+this.positions+R_DRICNRNS+"}"
555
	);
555
	);
556
}
556
}
557
557
Lines 566-573 Link Here
566
		"}\n";
566
		"}\n";
567
	completeInJavadoc("/Completion/src/bugs/b115662/Test.java", source, true, "to");
567
	completeInJavadoc("/Completion/src/bugs/b115662/Test.java", source, true, "to");
568
	assertSortedResults(
568
	assertSortedResults(
569
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICNRNS+"}\n" + 
569
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICNRNS+"}\n" + 
570
		"toto[FIELD_REF]{toto, Lbugs.b115662.Tests;, I, toto, null, "+this.positions+R_DICNRNS+"}"
570
		"toto[FIELD_REF]{toto, Lbugs.b115662.Tests;, I, toto, null, "+this.positions+R_DRICNRNS+"}"
571
	);
571
	);
572
}
572
}
573
573
Lines 582-588 Link Here
582
		"}\n";
582
		"}\n";
583
	completeInJavadoc("/Completion/src/bugs/b115662/Test.java", source, true, "toString");
583
	completeInJavadoc("/Completion/src/bugs/b115662/Test.java", source, true, "toString");
584
	assertSortedResults(
584
	assertSortedResults(
585
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DICENNRNS+"}"
585
		"toString[METHOD_REF]{toString(), Ljava.lang.Object;, ()Ljava.lang.String;, toString, null, "+this.positions+R_DRICENNRNS+"}"
586
	);
586
	);
587
}
587
}
588
588
Lines 608-615 Link Here
608
	};
608
	};
609
	completeInJavadoc(sources, true, "Reference#A_");
609
	completeInJavadoc(sources, true, "Reference#A_");
610
	assertSortedResults(
610
	assertSortedResults(
611
		"A_STATIC_FIELD[JAVADOC_FIELD_REF]{{@link Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DICNRIT+"}\n" + 
611
		"A_STATIC_FIELD[JAVADOC_FIELD_REF]{{@link Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DRICNRIT+"}\n" + 
612
		"A_STATIC_FIELD[JAVADOC_VALUE_REF]{{@value Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DICNRIT+"}"
612
		"A_STATIC_FIELD[JAVADOC_VALUE_REF]{{@value Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DRICNRIT+"}"
613
	);
613
	);
614
}
614
}
615
public void testBug117183b() throws JavaModelException {
615
public void testBug117183b() throws JavaModelException {
Lines 630-637 Link Here
630
	};
630
	};
631
	completeInJavadoc(sources, true, "Reference#A_STATIC_FIELD");
631
	completeInJavadoc(sources, true, "Reference#A_STATIC_FIELD");
632
	assertSortedResults(
632
	assertSortedResults(
633
		"A_STATIC_FIELD[JAVADOC_FIELD_REF]{{@link Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DICENNRIT+"}\n" + 
633
		"A_STATIC_FIELD[JAVADOC_FIELD_REF]{{@link Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DRICENNRIT+"}\n" + 
634
		"A_STATIC_FIELD[JAVADOC_VALUE_REF]{{@value Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DICENNRIT+"}"
634
		"A_STATIC_FIELD[JAVADOC_VALUE_REF]{{@value Reference#A_STATIC_FIELD}, Ljavadoc.bugs.Reference;, I, A_STATIC_FIELD, null, "+this.positions+R_DRICENNRIT+"}"
635
	);
635
	);
636
}
636
}
637
public void testBug117183c() throws JavaModelException {
637
public void testBug117183c() throws JavaModelException {
Lines 646-653 Link Here
646
	};
646
	};
647
	completeInJavadoc(sources, true, "Obj");
647
	completeInJavadoc(sources, true, "Obj");
648
	assertSortedResults(
648
	assertSortedResults(
649
		"Object[JAVADOC_TYPE_REF]{{@link Object}, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNRIT+"}\n" + 
649
		"Object[JAVADOC_TYPE_REF]{{@link Object}, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNRIT+"}\n" + 
650
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
650
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
651
	);
651
	);
652
}
652
}
653
public void testBug117183d() throws JavaModelException {
653
public void testBug117183d() throws JavaModelException {
Lines 662-669 Link Here
662
	};
662
	};
663
	completeInJavadoc(sources, true, "Str");
663
	completeInJavadoc(sources, true, "Str");
664
	assertSortedResults(
664
	assertSortedResults(
665
		"String[JAVADOC_TYPE_REF]{{@link String}, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICUNRIT+"}\n" + 
665
		"String[JAVADOC_TYPE_REF]{{@link String}, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICUNRIT+"}\n" + 
666
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICUNR+"}"
666
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICUNR+"}"
667
	);
667
	);
668
}
668
}
669
669
Lines 681-687 Link Here
681
		"}\n";
681
		"}\n";
682
	completeInJavadoc("/Completion/src/bugs/b118105/BasicTestBugs.java", source, true, "Str");
682
	completeInJavadoc("/Completion/src/bugs/b118105/BasicTestBugs.java", source, true, "Str");
683
	assertSortedResults(
683
	assertSortedResults(
684
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DICUNR+"}"
684
		"String[TYPE_REF]{String, java.lang, Ljava.lang.String;, null, null, "+this.positions+R_DRICUNR+"}"
685
	);
685
	);
686
}
686
}
687
687
Lines 739-745 Link Here
739
		"}\n";
739
		"}\n";
740
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "bugs.b118", 2); // 2nd occurence
740
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "bugs.b118", 2); // 2nd occurence
741
	assertSortedResults(
741
	assertSortedResults(
742
		"bugs.b118397[PACKAGE_REF]{bugs.b118397, bugs.b118397, null, null, null, "+this.positions+R_DICQNR+"}"
742
		"bugs.b118397[PACKAGE_REF]{bugs.b118397, bugs.b118397, null, null, null, "+this.positions+R_DRICQNR+"}"
743
	);
743
	);
744
}
744
}
745
public void testBug118397b() throws JavaModelException {
745
public void testBug118397b() throws JavaModelException {
Lines 754-761 Link Here
754
		"}\n";
754
		"}\n";
755
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "Basic");
755
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "Basic");
756
	assertSortedResults(
756
	assertSortedResults(
757
		"BasicTestBugs[TYPE_REF]{BasicTestBugs, bugs.b118397, Lbugs.b118397.BasicTestBugs;, null, null, "+this.positions+R_DICUNR+"}\n" + 
757
		"BasicTestBugs[TYPE_REF]{BasicTestBugs, bugs.b118397, Lbugs.b118397.BasicTestBugs;, null, null, "+this.positions+R_DRICUNR+"}\n" + 
758
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DICNR+"}"
758
		"BasicTestReferences[TYPE_REF]{org.eclipse.jdt.core.tests.BasicTestReferences, org.eclipse.jdt.core.tests, Lorg.eclipse.jdt.core.tests.BasicTestReferences;, null, null, "+this.positions+R_DRICNR+"}"
759
	);
759
	);
760
}
760
}
761
public void testBug118397c() throws JavaModelException {
761
public void testBug118397c() throws JavaModelException {
Lines 774-780 Link Here
774
		"}\n";
774
		"}\n";
775
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "In");
775
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "In");
776
	assertSortedResults(
776
	assertSortedResults(
777
		"BasicTestBugs.Inner[TYPE_REF]{Inner, bugs.b118397, Lbugs.b118397.BasicTestBugs$Inner;, null, null, "+this.positions+R_DICNR+"}"
777
		"BasicTestBugs.Inner[TYPE_REF]{Inner, bugs.b118397, Lbugs.b118397.BasicTestBugs$Inner;, null, null, "+this.positions+R_DRICNR+"}"
778
	);
778
	);
779
}
779
}
780
public void testBug118397d() throws JavaModelException {
780
public void testBug118397d() throws JavaModelException {
Lines 793-799 Link Here
793
		"}\n";
793
		"}\n";
794
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "Lev");
794
	completeInJavadoc("/Completion/src/bugs/b118397/BasicTestBugs.java", source, true, "Lev");
795
	assertSortedResults(
795
	assertSortedResults(
796
		"BasicTestBugs.Inner.Level2[TYPE_REF]{Level2, bugs.b118397, Lbugs.b118397.BasicTestBugs$Inner$Level2;, null, null, "+this.positions+R_DICNR+"}"
796
		"BasicTestBugs.Inner.Level2[TYPE_REF]{Level2, bugs.b118397, Lbugs.b118397.BasicTestBugs$Inner$Level2;, null, null, "+this.positions+R_DRICNR+"}"
797
	);
797
	);
798
}
798
}
799
799
Lines 813-819 Link Here
813
		"}\n";
813
		"}\n";
814
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
814
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
815
	assertSortedResults(
815
	assertSortedResults(
816
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
816
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
817
	);
817
	);
818
}
818
}
819
public void testBug139621b() throws JavaModelException {
819
public void testBug139621b() throws JavaModelException {
Lines 831-837 Link Here
831
		"}\n";
831
		"}\n";
832
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
832
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
833
	assertSortedResults(
833
	assertSortedResults(
834
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
834
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
835
	);
835
	);
836
}
836
}
837
public void testBug139621c() throws JavaModelException {
837
public void testBug139621c() throws JavaModelException {
Lines 902-908 Link Here
902
		"}\n";
902
		"}\n";
903
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
903
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
904
	assertSortedResults(
904
	assertSortedResults(
905
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
905
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
906
	);
906
	);
907
}
907
}
908
public void testBug139621f() throws JavaModelException {
908
public void testBug139621f() throws JavaModelException {
Lines 921-927 Link Here
921
		"}\n";
921
		"}\n";
922
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
922
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
923
	assertSortedResults(
923
	assertSortedResults(
924
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
924
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
925
	);
925
	);
926
}
926
}
927
public void testBug139621g() throws JavaModelException {
927
public void testBug139621g() throws JavaModelException {
Lines 933-939 Link Here
933
		" */\n";
933
		" */\n";
934
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
934
	completeInJavadoc("/Completion/src/bugs/b139621/BasicTestBugs.java", source, true, "Obj");
935
	assertSortedResults(
935
	assertSortedResults(
936
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DICUNR+"}"
936
		"Object[TYPE_REF]{Object, java.lang, Ljava.lang.Object;, null, null, "+this.positions+R_DRICUNR+"}"
937
	);
937
	);
938
}
938
}
939
public void testBug139621h() throws JavaModelException {
939
public void testBug139621h() throws JavaModelException {
Lines 996-1002 Link Here
996
		"}\n";
996
		"}\n";
997
	completeInJavadoc("/Completion/src/bugs/b144866/BasicTestBugs.java", source, true, "EX", 2); // 2nd occurence
997
	completeInJavadoc("/Completion/src/bugs/b144866/BasicTestBugs.java", source, true, "EX", 2); // 2nd occurence
998
	assertSortedResults(
998
	assertSortedResults(
999
		"EXAMPLE[FIELD_REF]{EXAMPLE, Lbugs.b144866.BasicTestBugs;, I, EXAMPLE, null, "+this.positions+R_DICNR+"}"
999
		"EXAMPLE[FIELD_REF]{EXAMPLE, Lbugs.b144866.BasicTestBugs;, I, EXAMPLE, null, "+this.positions+R_DRICNR+"}"
1000
	);
1000
	);
1001
}
1001
}
1002
1002
(-)codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java (-10 / +41 lines)
Lines 144-156 Link Here
144
		/* check for intermediate block creation, so recovery can properly close them afterwards */
144
		/* check for intermediate block creation, so recovery can properly close them afterwards */
145
		int nodeStart = node.sourceStart;
145
		int nodeStart = node.sourceStart;
146
		for (int j = blockIndex; j <= realBlockPtr; j++){
146
		for (int j = blockIndex; j <= realBlockPtr; j++){
147
			if (blockStarts[j] > nodeStart){
147
			if (blockStarts[j] >= 0) {
148
				blockIndex = j; // shift the index to the new block
148
				if (blockStarts[j] > nodeStart){
149
				break;
149
					blockIndex = j; // shift the index to the new block
150
			}
150
					break;
151
			if (blockStarts[j] != lastStart){ // avoid multiple block if at same position
151
				}
152
				if (blockStarts[j] != lastStart){ // avoid multiple block if at same position
153
					block = new Block(0);
154
					block.sourceStart = lastStart = blockStarts[j];
155
					element = element.add(block, 1);
156
				}
157
			} else {
158
				if (-blockStarts[j] > nodeStart){
159
					blockIndex = j; // shift the index to the new block
160
					break;
161
				}
152
				block = new Block(0);
162
				block = new Block(0);
153
				block.sourceStart = lastStart = blockStarts[j];
163
				block.sourceStart = lastStart = -blockStarts[j];
154
				element = element.add(block, 1);
164
				element = element.add(block, 1);
155
			}
165
			}
156
			blockIndex = j+1; // shift the index to the new block
166
			blockIndex = j+1; // shift the index to the new block
Lines 231-240 Link Here
231
	/* might need some extra block (after the last reduced node) */
241
	/* might need some extra block (after the last reduced node) */
232
	int pos = this.assistNode == null ? lastCheckPoint : this.assistNode.sourceStart;
242
	int pos = this.assistNode == null ? lastCheckPoint : this.assistNode.sourceStart;
233
	for (int j = blockIndex; j <= realBlockPtr; j++){
243
	for (int j = blockIndex; j <= realBlockPtr; j++){
234
		if ((blockStarts[j] < pos) && (blockStarts[j] != lastStart)){ // avoid multiple block if at same position
244
		if (blockStarts[j] >= 0) {
235
			block = new Block(0);
245
			if ((blockStarts[j] < pos) && (blockStarts[j] != lastStart)){ // avoid multiple block if at same position
236
			block.sourceStart = lastStart = blockStarts[j];
246
				block = new Block(0);
237
			element = element.add(block, 1);
247
				block.sourceStart = lastStart = blockStarts[j];
248
				element = element.add(block, 1);
249
			}
250
		} else {
251
			if ((blockStarts[j] < pos)){ // avoid multiple block if at same position
252
				block = new Block(0);
253
				block.sourceStart = lastStart = -blockStarts[j];
254
				element = element.add(block, 1);
255
			}
238
		}
256
		}
239
	}
257
	}
240
	
258
	
Lines 403-408 Link Here
403
	}
421
	}
404
	this.blockStarts[this.realBlockPtr] = scanner.startPosition;
422
	this.blockStarts[this.realBlockPtr] = scanner.startPosition;
405
}
423
}
424
protected void consumeOpenFakeBlock() {
425
	// OpenBlock ::= $empty
426
427
	super.consumeOpenBlock();
428
	int stackLength = this.blockStarts.length;
429
	if (this.realBlockPtr >= stackLength) {
430
		System.arraycopy(
431
			this.blockStarts, 0,
432
			this.blockStarts = new int[stackLength + StackIncrement], 0,
433
			stackLength);
434
	}
435
	this.blockStarts[this.realBlockPtr] = -scanner.startPosition;
436
}
406
protected void consumePackageDeclarationName() {
437
protected void consumePackageDeclarationName() {
407
	// PackageDeclarationName ::= 'package' Name
438
	// PackageDeclarationName ::= 'package' Name
408
	/* build an ImportRef build from the last name 
439
	/* build an ImportRef build from the last name 
(-)codeassist/org/eclipse/jdt/internal/codeassist/UnresolvedReferenceNameFinder.java (+47 lines)
Lines 33-38 Link Here
33
33
34
public class UnresolvedReferenceNameFinder extends ASTVisitor {
34
public class UnresolvedReferenceNameFinder extends ASTVisitor {
35
	private static final int MAX_LINE_COUNT = 100;
35
	private static final int MAX_LINE_COUNT = 100;
36
	private static final int FAKE_BLOCKS_COUNT = 50;
36
	
37
	
37
	public static interface UnresolvedReferenceNameRequestor {
38
	public static interface UnresolvedReferenceNameRequestor {
38
		public void acceptName(char[] name);
39
		public void acceptName(char[] name);
Lines 122-127 Link Here
122
		return fakeMethod;
123
		return fakeMethod;
123
	}
124
	}
124
	
125
	
126
	public void findBefore(char[] startWith, Scope scope, ClassScope classScope, int from, int to, UnresolvedReferenceNameRequestor nameRequestor) {
127
		MethodDeclaration fakeMethod = this.findBefore(startWith, scope, from, to, nameRequestor);
128
		if (fakeMethod != null) fakeMethod.traverse(this, classScope);
129
	}
130
	
131
	private MethodDeclaration findBefore(char[] startWith, Scope s, int from, int to, UnresolvedReferenceNameRequestor nameRequestor) {
132
		this.requestor = nameRequestor;
133
		
134
		// reinitialize completion scanner to be usable as a normal scanner
135
		this.completionScanner.cursorLocation = 0;
136
		
137
		// reinitialize completionIdentifier
138
		this.completionScanner.prefix = startWith;
139
		
140
		int minStart =
141
			this.completionScanner.getLineStart(
142
					this.completionScanner.getLineNumber(to) - MAX_LINE_COUNT);
143
		
144
		int start;
145
		int fakeBlocksCount;
146
		if (minStart <= from) {
147
			start = from;
148
			fakeBlocksCount = 0;
149
		} else {
150
			start = minStart;
151
			fakeBlocksCount = FAKE_BLOCKS_COUNT;
152
		}
153
		
154
		this.completionScanner.startRecordingIdentifiers();
155
		
156
		MethodDeclaration fakeMethod = this.parser.parseStatementsBeforeCompletion(
157
				start,
158
				to,
159
				fakeBlocksCount,
160
				s.compilationUnitScope().referenceContext);
161
		
162
		this.completionScanner.stopRecordingIdentifiers();
163
		
164
		if(!this.initPotentialNamesTables()) return null;
165
		
166
		this.parentsPtr = -1;
167
		this.parents = new ASTNode[10];
168
		
169
		return fakeMethod;
170
	}
171
	
125
	private boolean initPotentialNamesTables() {
172
	private boolean initPotentialNamesTables() {
126
		char[][] pvns = this.completionScanner.potentialVariableNames;
173
		char[][] pvns = this.completionScanner.potentialVariableNames;
127
		int[] pvnss = this.completionScanner.potentialVariableNameStarts;
174
		int[] pvnss = this.completionScanner.potentialVariableNameStarts;
(-)codeassist/org/eclipse/jdt/internal/codeassist/RelevanceConstants.java (+1 lines)
Lines 41-44 Link Here
41
	int R_VALUE_TAG = 31;
41
	int R_VALUE_TAG = 31;
42
	int R_NON_INHERITED = 2;
42
	int R_NON_INHERITED = 2;
43
	int R_NO_PROBLEMS = 1;
43
	int R_NO_PROBLEMS = 1;
44
	int R_RESOLVED = 1;
44
}
45
}
(-)codeassist/org/eclipse/jdt/internal/codeassist/CompletionEngine.java (-1 / +150 lines)
Lines 479-484 Link Here
479
				}
479
				}
480
				
480
				
481
				int relevance = computeBaseRelevance();
481
				int relevance = computeBaseRelevance();
482
				relevance += computeRelevanceForResolution();
482
				relevance += computeRelevanceForInterestingProposal();
483
				relevance += computeRelevanceForInterestingProposal();
483
				relevance += computeRelevanceForRestrictions(accessibility);
484
				relevance += computeRelevanceForRestrictions(accessibility);
484
				if(insideQualifiedReference) {
485
				if(insideQualifiedReference) {
Lines 671-676 Link Here
671
		}
672
		}
672
673
673
		int relevance = computeBaseRelevance();
674
		int relevance = computeBaseRelevance();
675
		relevance += computeRelevanceForResolution();
674
		relevance += computeRelevanceForInterestingProposal();
676
		relevance += computeRelevanceForInterestingProposal();
675
		relevance += computeRelevanceForRestrictions(accessibility);
677
		relevance += computeRelevanceForRestrictions(accessibility);
676
		relevance += computeRelevanceForCaseMatching(this.completionToken, simpleTypeName);
678
		relevance += computeRelevanceForCaseMatching(this.completionToken, simpleTypeName);
Lines 727-732 Link Here
727
		}
729
		}
728
								
730
								
729
		int relevance = computeBaseRelevance();
731
		int relevance = computeBaseRelevance();
732
		relevance += computeRelevanceForResolution();
730
		relevance += computeRelevanceForInterestingProposal();
733
		relevance += computeRelevanceForInterestingProposal();
731
		relevance += computeRelevanceForCaseMatching(this.qualifiedCompletionToken == null ? this.completionToken : this.qualifiedCompletionToken, packageName);
734
		relevance += computeRelevanceForCaseMatching(this.qualifiedCompletionToken == null ? this.completionToken : this.qualifiedCompletionToken, packageName);
732
		if(!this.resolvingImports) {
735
		if(!this.resolvingImports) {
Lines 885-890 Link Here
885
			} else if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
888
			} else if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
886
				findTypesAndPackages(this.completionToken, scope, new ObjectVector());
889
				findTypesAndPackages(this.completionToken, scope, new ObjectVector());
887
			} else {
890
			} else {
891
				if (scope instanceof BlockScope && !this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
892
					char[][] alreadyDefinedName = computeAlreadyDefinedName((BlockScope)scope, singleNameReference);
893
					
894
					findUnresolvedReference(singleNameReference.sourceStart - 1, (BlockScope)scope, alreadyDefinedName);
895
				}
888
				findVariablesAndMethods(
896
				findVariablesAndMethods(
889
					this.completionToken,
897
					this.completionToken,
890
					scope,
898
					scope,
Lines 1041-1046 Link Here
1041
						findKeywords(this.completionToken, new char[][]{Keywords.THIS}, false, true);
1049
						findKeywords(this.completionToken, new char[][]{Keywords.THIS}, false, true);
1042
					} else {
1050
					} else {
1043
						int relevance = computeBaseRelevance();
1051
						int relevance = computeBaseRelevance();
1052
						relevance += computeRelevanceForResolution();
1044
						relevance += computeRelevanceForInterestingProposal();
1053
						relevance += computeRelevanceForInterestingProposal();
1045
						relevance += computeRelevanceForCaseMatching(this.completionToken, Keywords.THIS);
1054
						relevance += computeRelevanceForCaseMatching(this.completionToken, Keywords.THIS);
1046
						relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywords
1055
						relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywords
Lines 1432-1437 Link Here
1432
					if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
1441
					if (this.expectedTypesPtr > -1 && this.expectedTypes[0].isAnnotationType()) {
1433
						findTypesAndPackages(this.completionToken, scope, new ObjectVector());
1442
						findTypesAndPackages(this.completionToken, scope, new ObjectVector());
1434
					} else {
1443
					} else {
1444
						if (scope instanceof BlockScope && !this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
1445
							char[][] alreadyDefinedName = computeAlreadyDefinedName((BlockScope)scope, FakeInvocationSite);
1446
							
1447
							findUnresolvedReference(memberValuePair.sourceStart - 1, (BlockScope)scope, alreadyDefinedName);
1448
						}
1435
						findVariablesAndMethods(
1449
						findVariablesAndMethods(
1436
							this.completionToken,
1450
							this.completionToken,
1437
							scope,
1451
							scope,
Lines 2094-2099 Link Here
2094
			}
2108
			}
2095
			
2109
			
2096
			int relevance = computeBaseRelevance();
2110
			int relevance = computeBaseRelevance();
2111
			relevance += computeRelevanceForResolution();
2097
			relevance += computeRelevanceForInterestingProposal(method);
2112
			relevance += computeRelevanceForInterestingProposal(method);
2098
			relevance += computeRelevanceForCaseMatching(token, method.selector);
2113
			relevance += computeRelevanceForCaseMatching(token, method.selector);
2099
			relevance += computeRelevanceForQualification(false);
2114
			relevance += computeRelevanceForQualification(false);
Lines 2125-2130 Link Here
2125
		if (currentType.isInterface()) {
2140
		if (currentType.isInterface()) {
2126
			char[] completion = CharOperation.NO_CHAR;
2141
			char[] completion = CharOperation.NO_CHAR;
2127
			int relevance = computeBaseRelevance();
2142
			int relevance = computeBaseRelevance();
2143
			relevance += computeRelevanceForResolution();
2128
			relevance += computeRelevanceForInterestingProposal();
2144
			relevance += computeRelevanceForInterestingProposal();
2129
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2145
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2130
			
2146
			
Lines 2174-2179 Link Here
2174
			&& CharOperation.prefixEquals(token, classField, false /* ignore case */
2190
			&& CharOperation.prefixEquals(token, classField, false /* ignore case */
2175
		)) {
2191
		)) {
2176
			int relevance = computeBaseRelevance();
2192
			int relevance = computeBaseRelevance();
2193
			relevance += computeRelevanceForResolution();
2177
			relevance += computeRelevanceForInterestingProposal();
2194
			relevance += computeRelevanceForInterestingProposal();
2178
			relevance += computeRelevanceForCaseMatching(token, classField);
2195
			relevance += computeRelevanceForCaseMatching(token, classField);
2179
			relevance += computeRelevanceForExpectingType(scope.getJavaLangClass());
2196
			relevance += computeRelevanceForExpectingType(scope.getJavaLangClass());
Lines 2443-2448 Link Here
2443
		}
2460
		}
2444
		
2461
		
2445
		int relevance = computeBaseRelevance();
2462
		int relevance = computeBaseRelevance();
2463
		relevance += computeRelevanceForResolution();
2446
		relevance += computeRelevanceForInterestingProposal();
2464
		relevance += computeRelevanceForInterestingProposal();
2447
		relevance += computeRelevanceForCaseMatching(typeName, exceptionType.sourceName);
2465
		relevance += computeRelevanceForCaseMatching(typeName, exceptionType.sourceName);
2448
		relevance += computeRelevanceForExpectingType(exceptionType);
2466
		relevance += computeRelevanceForExpectingType(exceptionType);
Lines 2519-2524 Link Here
2519
						completion = CharOperation.concat(name, new char[] { '(', ')' });
2537
						completion = CharOperation.concat(name, new char[] { '(', ')' });
2520
					
2538
					
2521
					int relevance = computeBaseRelevance();
2539
					int relevance = computeBaseRelevance();
2540
					relevance += computeRelevanceForResolution();
2522
					relevance += computeRelevanceForInterestingProposal();
2541
					relevance += computeRelevanceForInterestingProposal();
2523
					relevance += computeRelevanceForCaseMatching(this.completionToken, name);
2542
					relevance += computeRelevanceForCaseMatching(this.completionToken, name);
2524
					relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2543
					relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
Lines 2604-2609 Link Here
2604
					char[] completion = CharOperation.NO_CHAR;
2623
					char[] completion = CharOperation.NO_CHAR;
2605
					if(forAnonymousType){
2624
					if(forAnonymousType){
2606
						int relevance = computeBaseRelevance();
2625
						int relevance = computeBaseRelevance();
2626
						relevance += computeRelevanceForResolution();
2607
						relevance += computeRelevanceForInterestingProposal();
2627
						relevance += computeRelevanceForInterestingProposal();
2608
						relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2628
						relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2609
						
2629
						
Lines 2636-2641 Link Here
2636
						}
2656
						}
2637
					} else {
2657
					} else {
2638
						int relevance = computeBaseRelevance();
2658
						int relevance = computeBaseRelevance();
2659
						relevance += computeRelevanceForResolution();
2639
						relevance += computeRelevanceForInterestingProposal();
2660
						relevance += computeRelevanceForInterestingProposal();
2640
						relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2661
						relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
2641
2662
Lines 2929-2934 Link Here
2929
			}
2950
			}
2930
2951
2931
			int relevance = computeBaseRelevance();
2952
			int relevance = computeBaseRelevance();
2953
			relevance += computeRelevanceForResolution();
2932
			relevance += computeRelevanceForInterestingProposal(field);
2954
			relevance += computeRelevanceForInterestingProposal(field);
2933
			if (fieldName != null) relevance += computeRelevanceForCaseMatching(fieldName, field.name);
2955
			if (fieldName != null) relevance += computeRelevanceForCaseMatching(fieldName, field.name);
2934
			relevance += computeRelevanceForExpectingType(field.type);
2956
			relevance += computeRelevanceForExpectingType(field.type);
Lines 3155-3160 Link Here
3155
			)) {
3177
			)) {
3156
				
3178
				
3157
				int relevance = computeBaseRelevance();
3179
				int relevance = computeBaseRelevance();
3180
				relevance += computeRelevanceForResolution();
3158
				relevance += computeRelevanceForInterestingProposal();
3181
				relevance += computeRelevanceForInterestingProposal();
3159
				relevance += computeRelevanceForCaseMatching(token,lengthField);
3182
				relevance += computeRelevanceForCaseMatching(token,lengthField);
3160
				relevance += computeRelevanceForExpectingType(TypeBinding.INT);
3183
				relevance += computeRelevanceForExpectingType(TypeBinding.INT);
Lines 3201-3206 Link Here
3201
				ReferenceBinding objectRef = scope.getJavaLangObject();
3224
				ReferenceBinding objectRef = scope.getJavaLangObject();
3202
				
3225
				
3203
				int relevance = computeBaseRelevance();
3226
				int relevance = computeBaseRelevance();
3227
				relevance += computeRelevanceForResolution();
3204
				relevance += computeRelevanceForInterestingProposal();
3228
				relevance += computeRelevanceForInterestingProposal();
3205
				relevance += computeRelevanceForCaseMatching(token, cloneMethod);
3229
				relevance += computeRelevanceForCaseMatching(token, cloneMethod);
3206
				relevance += computeRelevanceForExpectingType(objectRef);
3230
				relevance += computeRelevanceForExpectingType(objectRef);
Lines 3595-3600 Link Here
3595
			fieldsFound.add(new Object[]{field, receiverType});
3619
			fieldsFound.add(new Object[]{field, receiverType});
3596
			
3620
			
3597
			int relevance = computeBaseRelevance();
3621
			int relevance = computeBaseRelevance();
3622
			relevance += computeRelevanceForResolution();
3598
			relevance += computeRelevanceForInterestingProposal(field);
3623
			relevance += computeRelevanceForInterestingProposal(field);
3599
			if (fieldName != null) relevance += computeRelevanceForCaseMatching(fieldName, field.name);
3624
			if (fieldName != null) relevance += computeRelevanceForCaseMatching(fieldName, field.name);
3600
			relevance += computeRelevanceForExpectingType(field.type);
3625
			relevance += computeRelevanceForExpectingType(field.type);
Lines 3756-3761 Link Here
3756
			completionName = CharOperation.concat(completionName, SEMICOLON);
3781
			completionName = CharOperation.concat(completionName, SEMICOLON);
3757
			
3782
			
3758
			int relevance = computeBaseRelevance();
3783
			int relevance = computeBaseRelevance();
3784
			relevance += computeRelevanceForResolution();
3759
			relevance += computeRelevanceForInterestingProposal();
3785
			relevance += computeRelevanceForInterestingProposal();
3760
			relevance += computeRelevanceForCaseMatching(typeName, memberType.sourceName);
3786
			relevance += computeRelevanceForCaseMatching(typeName, memberType.sourceName);
3761
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
3787
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
Lines 3810-3815 Link Here
3810
			completionName = CharOperation.concat(completionName, SEMICOLON);
3836
			completionName = CharOperation.concat(completionName, SEMICOLON);
3811
			
3837
			
3812
			int relevance = computeBaseRelevance();
3838
			int relevance = computeBaseRelevance();
3839
			relevance += computeRelevanceForResolution();
3813
			relevance += computeRelevanceForInterestingProposal();
3840
			relevance += computeRelevanceForInterestingProposal();
3814
			relevance += computeRelevanceForCaseMatching(fieldName, field.name);
3841
			relevance += computeRelevanceForCaseMatching(fieldName, field.name);
3815
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
3842
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
Lines 3885-3890 Link Here
3885
			completionName = CharOperation.concat(completionName, SEMICOLON);
3912
			completionName = CharOperation.concat(completionName, SEMICOLON);
3886
			
3913
			
3887
			int relevance = computeBaseRelevance();
3914
			int relevance = computeBaseRelevance();
3915
			relevance += computeRelevanceForResolution();
3888
			relevance += computeRelevanceForInterestingProposal();
3916
			relevance += computeRelevanceForInterestingProposal();
3889
			relevance += computeRelevanceForCaseMatching(methodName, method.selector);
3917
			relevance += computeRelevanceForCaseMatching(methodName, method.selector);
3890
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
3918
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE);
Lines 3995-4000 Link Here
3995
					&& CharOperation.prefixEquals(keyword, choices[i], false /* ignore case */
4023
					&& CharOperation.prefixEquals(keyword, choices[i], false /* ignore case */
3996
				)){
4024
				)){
3997
					int relevance = computeBaseRelevance();
4025
					int relevance = computeBaseRelevance();
4026
					relevance += computeRelevanceForResolution();
3998
					relevance += computeRelevanceForInterestingProposal();
4027
					relevance += computeRelevanceForInterestingProposal();
3999
					relevance += computeRelevanceForCaseMatching(keyword, choices[i]);
4028
					relevance += computeRelevanceForCaseMatching(keyword, choices[i]);
4000
					relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywors
4029
					relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywors
Lines 4028-4033 Link Here
4028
					CharOperation.equals(choices[i], Keywords.FALSE)
4057
					CharOperation.equals(choices[i], Keywords.FALSE)
4029
			){
4058
			){
4030
				int relevance = computeBaseRelevance();
4059
				int relevance = computeBaseRelevance();
4060
				relevance += computeRelevanceForResolution();
4031
				relevance += computeRelevanceForInterestingProposal();
4061
				relevance += computeRelevanceForInterestingProposal();
4032
				relevance += computeRelevanceForCaseMatching(CharOperation.NO_CHAR, choices[i]);
4062
				relevance += computeRelevanceForCaseMatching(CharOperation.NO_CHAR, choices[i]);
4033
				relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywors
4063
				relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywors
Lines 4245-4250 Link Here
4245
			}
4275
			}
4246
			
4276
			
4247
			int relevance = computeBaseRelevance();
4277
			int relevance = computeBaseRelevance();
4278
			relevance += computeRelevanceForResolution();
4248
			relevance += computeRelevanceForInterestingProposal();
4279
			relevance += computeRelevanceForInterestingProposal();
4249
			relevance += computeRelevanceForCaseMatching(typeName, memberType.sourceName);
4280
			relevance += computeRelevanceForCaseMatching(typeName, memberType.sourceName);
4250
			relevance += computeRelevanceForExpectingType(memberType);
4281
			relevance += computeRelevanceForExpectingType(memberType);
Lines 4850-4855 Link Here
4850
			}
4881
			}
4851
4882
4852
			int relevance = computeBaseRelevance();
4883
			int relevance = computeBaseRelevance();
4884
			relevance += computeRelevanceForResolution();
4853
			relevance += computeRelevanceForInterestingProposal();
4885
			relevance += computeRelevanceForInterestingProposal();
4854
			if (methodName != null) relevance += computeRelevanceForCaseMatching(methodName, method.selector);
4886
			if (methodName != null) relevance += computeRelevanceForCaseMatching(methodName, method.selector);
4855
			relevance += computeRelevanceForExpectingType(method.returnType);
4887
			relevance += computeRelevanceForExpectingType(method.returnType);
Lines 5045-5050 Link Here
5045
				}
5077
				}
5046
				
5078
				
5047
				int relevance = computeBaseRelevance();
5079
				int relevance = computeBaseRelevance();
5080
				relevance += computeRelevanceForResolution();
5048
				relevance += computeRelevanceForInterestingProposal();
5081
				relevance += computeRelevanceForInterestingProposal();
5049
				if (methodName != null) relevance += computeRelevanceForCaseMatching(methodName, method.selector);
5082
				if (methodName != null) relevance += computeRelevanceForCaseMatching(methodName, method.selector);
5050
				relevance += computeRelevanceForExpectingType(method.returnType);
5083
				relevance += computeRelevanceForExpectingType(method.returnType);
Lines 5301-5306 Link Here
5301
			}
5334
			}
5302
			
5335
			
5303
			int relevance = computeBaseRelevance();
5336
			int relevance = computeBaseRelevance();
5337
			relevance += computeRelevanceForResolution();
5304
			relevance += computeRelevanceForInterestingProposal();
5338
			relevance += computeRelevanceForInterestingProposal();
5305
			relevance += computeRelevanceForCaseMatching(methodName, method.selector);
5339
			relevance += computeRelevanceForCaseMatching(methodName, method.selector);
5306
			relevance += computeRelevanceForExpectingType(method.returnType);
5340
			relevance += computeRelevanceForExpectingType(method.returnType);
Lines 5391-5397 Link Here
5391
		}
5425
		}
5392
		return 0;
5426
		return 0;
5393
	}
5427
	}
5394
	private int computeRelevanceForQualification(boolean prefixRequired) {
5428
	int computeRelevanceForQualification(boolean prefixRequired) {
5395
		if(!prefixRequired && !this.insideQualifiedReference) {
5429
		if(!prefixRequired && !this.insideQualifiedReference) {
5396
			return R_UNQUALIFIED;
5430
			return R_UNQUALIFIED;
5397
		}
5431
		}
Lines 5498-5503 Link Here
5498
				&& CharOperation.prefixEquals(label, choices[i], false /* ignore case */
5532
				&& CharOperation.prefixEquals(label, choices[i], false /* ignore case */
5499
			)){
5533
			)){
5500
				int relevance = computeBaseRelevance();
5534
				int relevance = computeBaseRelevance();
5535
				relevance += computeRelevanceForResolution();
5501
				relevance += computeRelevanceForInterestingProposal();
5536
				relevance += computeRelevanceForInterestingProposal();
5502
				relevance += computeRelevanceForCaseMatching(label, choices[i]);
5537
				relevance += computeRelevanceForCaseMatching(label, choices[i]);
5503
				relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywors
5538
				relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for keywors
Lines 5614-5619 Link Here
5614
			}
5649
			}
5615
5650
5616
			int relevance = computeBaseRelevance();
5651
			int relevance = computeBaseRelevance();
5652
			relevance += computeRelevanceForResolution();
5617
			relevance += computeRelevanceForInterestingProposal();
5653
			relevance += computeRelevanceForInterestingProposal();
5618
			relevance += computeRelevanceForCaseMatching(methodName, method.selector);
5654
			relevance += computeRelevanceForCaseMatching(methodName, method.selector);
5619
			relevance += R_METHOD_OVERIDE;
5655
			relevance += R_METHOD_OVERIDE;
Lines 6175-6180 Link Here
6175
								}
6211
								}
6176
6212
6177
								int relevance = computeBaseRelevance();
6213
								int relevance = computeBaseRelevance();
6214
								relevance += computeRelevanceForResolution();
6178
								relevance += computeRelevanceForInterestingProposal();
6215
								relevance += computeRelevanceForInterestingProposal();
6179
								relevance += computeRelevanceForCaseMatching(typeName, localType.sourceName);
6216
								relevance += computeRelevanceForCaseMatching(typeName, localType.sourceName);
6180
								relevance += computeRelevanceForExpectingType(localType);
6217
								relevance += computeRelevanceForExpectingType(localType);
Lines 6247-6252 Link Here
6247
			}
6284
			}
6248
6285
6249
			int relevance = computeBaseRelevance();
6286
			int relevance = computeBaseRelevance();
6287
			relevance += computeRelevanceForResolution();
6250
			relevance += computeRelevanceForInterestingProposal();
6288
			relevance += computeRelevanceForInterestingProposal();
6251
			relevance += computeRelevanceForCaseMatching(refBinding.sourceName, refBinding.sourceName);
6289
			relevance += computeRelevanceForCaseMatching(refBinding.sourceName, refBinding.sourceName);
6252
			relevance += computeRelevanceForExpectingType(refBinding);
6290
			relevance += computeRelevanceForExpectingType(refBinding);
Lines 6295-6300 Link Here
6295
							&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, typeParameter.name))) continue;
6333
							&& !(this.options.camelCaseMatch && CharOperation.camelCaseMatch(token, typeParameter.name))) continue;
6296
	
6334
	
6297
					int relevance = computeBaseRelevance();
6335
					int relevance = computeBaseRelevance();
6336
					relevance += computeRelevanceForResolution();
6298
					relevance += computeRelevanceForInterestingProposal();
6337
					relevance += computeRelevanceForInterestingProposal();
6299
					relevance += computeRelevanceForCaseMatching(token, typeParameter.name);
6338
					relevance += computeRelevanceForCaseMatching(token, typeParameter.name);
6300
					relevance += computeRelevanceForExpectingType(typeParameter.type == null ? null :typeParameter.type.resolvedType);
6339
					relevance += computeRelevanceForExpectingType(typeParameter.type == null ? null :typeParameter.type.resolvedType);
Lines 6401-6406 Link Here
6401
				}
6440
				}
6402
				
6441
				
6403
				int relevance = computeBaseRelevance();
6442
				int relevance = computeBaseRelevance();
6443
				relevance += computeRelevanceForResolution();
6404
				relevance += computeRelevanceForInterestingProposal();
6444
				relevance += computeRelevanceForInterestingProposal();
6405
				relevance += computeRelevanceForCaseMatching(token, sourceType.sourceName);
6445
				relevance += computeRelevanceForCaseMatching(token, sourceType.sourceName);
6406
				relevance += computeRelevanceForExpectingType(sourceType);
6446
				relevance += computeRelevanceForExpectingType(sourceType);
Lines 6498-6503 Link Here
6498
							}
6538
							}
6499
							
6539
							
6500
							int relevance = computeBaseRelevance();
6540
							int relevance = computeBaseRelevance();
6541
							relevance += computeRelevanceForResolution();
6501
							relevance += computeRelevanceForInterestingProposal();
6542
							relevance += computeRelevanceForInterestingProposal();
6502
							relevance += computeRelevanceForCaseMatching(token, typeName);
6543
							relevance += computeRelevanceForCaseMatching(token, typeName);
6503
							relevance += computeRelevanceForExpectingType(refBinding);
6544
							relevance += computeRelevanceForExpectingType(refBinding);
Lines 6646-6651 Link Here
6646
				this.knownTypes.put(CharOperation.concat(sourceType.qualifiedPackageName(), sourceType.sourceName(), '.'), this);
6687
				this.knownTypes.put(CharOperation.concat(sourceType.qualifiedPackageName(), sourceType.sourceName(), '.'), this);
6647
6688
6648
				int relevance = computeBaseRelevance();
6689
				int relevance = computeBaseRelevance();
6690
				relevance += computeRelevanceForResolution();
6649
				relevance += computeRelevanceForInterestingProposal();
6691
				relevance += computeRelevanceForInterestingProposal();
6650
				relevance += computeRelevanceForCaseMatching(qualifiedName, qualifiedSourceTypeName);
6692
				relevance += computeRelevanceForCaseMatching(qualifiedName, qualifiedSourceTypeName);
6651
				relevance += computeRelevanceForExpectingType(sourceType);
6693
				relevance += computeRelevanceForExpectingType(sourceType);
Lines 6739-6744 Link Here
6739
							}
6781
							}
6740
							
6782
							
6741
							int relevance = computeBaseRelevance();
6783
							int relevance = computeBaseRelevance();
6784
							relevance += computeRelevanceForResolution();
6742
							relevance += computeRelevanceForInterestingProposal();
6785
							relevance += computeRelevanceForInterestingProposal();
6743
							relevance += computeRelevanceForCaseMatching(token, typeBinding.sourceName);
6786
							relevance += computeRelevanceForCaseMatching(token, typeBinding.sourceName);
6744
							relevance += computeRelevanceForExpectingType(typeBinding);
6787
							relevance += computeRelevanceForExpectingType(typeBinding);
Lines 6838-6843 Link Here
6838
							localsFound.add(local);
6881
							localsFound.add(local);
6839
	
6882
	
6840
							int relevance = computeBaseRelevance();
6883
							int relevance = computeBaseRelevance();
6884
							relevance += computeRelevanceForResolution();
6841
							relevance += computeRelevanceForInterestingProposal(local);
6885
							relevance += computeRelevanceForInterestingProposal(local);
6842
							relevance += computeRelevanceForCaseMatching(token, local.name);
6886
							relevance += computeRelevanceForCaseMatching(token, local.name);
6843
							relevance += computeRelevanceForExpectingType(local.type);
6887
							relevance += computeRelevanceForExpectingType(local.type);
Lines 7139-7144 Link Here
7139
		
7183
		
7140
		return null;
7184
		return null;
7141
	}
7185
	}
7186
	
7187
	private char[][] findUnresolvedReference(int to, BlockScope scope, final char[][] discouragedNames) {
7188
		final int discouragedNamesCount = discouragedNames == null ? 0 : discouragedNames.length;
7189
		final ArrayList proposedNames = new ArrayList();
7190
		
7191
		UnresolvedReferenceNameFinder.UnresolvedReferenceNameRequestor nameRequestor = 
7192
			new UnresolvedReferenceNameFinder.UnresolvedReferenceNameRequestor() {
7193
				public void acceptName(char[] name) {
7194
					for (int i = 0; i < discouragedNamesCount; i++) {
7195
						if (CharOperation.equals(discouragedNames[i], name, false)) return;
7196
					}
7197
					
7198
					int relevance = computeBaseRelevance();
7199
					relevance += computeRelevanceForResolution(false);
7200
					relevance += computeRelevanceForInterestingProposal();
7201
					relevance += computeRelevanceForCaseMatching(completionToken, name);
7202
					relevance += computeRelevanceForQualification(false);
7203
					relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for local variable
7204
					CompletionEngine.this.noProposal = false;
7205
					if(!CompletionEngine.this.requestor.isIgnored(CompletionProposal.LOCAL_VARIABLE_REF)) {
7206
						CompletionProposal proposal = CompletionEngine.this.createProposal(CompletionProposal.LOCAL_VARIABLE_REF, CompletionEngine.this.actualCompletionPosition);
7207
						proposal.setSignature(
7208
							createTypeSignature(
7209
									CharOperation.concatWith(JAVA_LANG, '.'),
7210
									OBJECT));
7211
						proposal.setPackageName(CharOperation.concatWith(JAVA_LANG, '.'));
7212
						proposal.setTypeName(OBJECT);
7213
						proposal.setName(name);
7214
						proposal.setCompletion(name);
7215
						proposal.setFlags(Flags.AccDefault);
7216
						proposal.setReplaceRange(CompletionEngine.this.startPosition - CompletionEngine.this.offset, CompletionEngine.this.endPosition - CompletionEngine.this.offset);
7217
						proposal.setRelevance(relevance);
7218
						CompletionEngine.this.requestor.accept(proposal);
7219
						if(DEBUG) {
7220
							CompletionEngine.this.printDebug(proposal);
7221
						}
7222
					}
7223
					
7224
					proposedNames.add(name);
7225
				}
7226
			};
7227
			
7228
		BlockScope upperScope = scope;
7229
		while (upperScope.enclosingMethodScope() != null) {
7230
			upperScope = upperScope.enclosingMethodScope();
7231
		}
7232
		
7233
		ReferenceContext referenceContext = upperScope.referenceContext();
7234
		if (referenceContext instanceof AbstractMethodDeclaration) {
7235
			AbstractMethodDeclaration md = (AbstractMethodDeclaration)referenceContext;
7236
			
7237
			UnresolvedReferenceNameFinder nameFinder = new UnresolvedReferenceNameFinder(this);
7238
			nameFinder.findBefore(
7239
					completionToken,
7240
					md.scope,
7241
					md.scope.classScope(),
7242
					md.bodyStart,
7243
					to,
7244
					nameRequestor);
7245
		} else if (referenceContext instanceof TypeDeclaration) {
7246
			TypeDeclaration typeDeclaration = (TypeDeclaration) referenceContext;
7247
			
7248
			
7249
			done : {
7250
				FieldDeclaration[] fields = typeDeclaration.fields;
7251
				if (fields != null) {
7252
					for (int i = 0; i < fields.length; i++) {
7253
						if (fields[i] instanceof Initializer) {
7254
							Initializer initializer = (Initializer) fields[i];
7255
							if (initializer.block.sourceStart <= to &&
7256
									to < initializer.bodyEnd) {
7257
					
7258
								UnresolvedReferenceNameFinder nameFinder = new UnresolvedReferenceNameFinder(this);
7259
								nameFinder.findBefore(
7260
										completionToken,
7261
										typeDeclaration.scope,
7262
										typeDeclaration.scope,
7263
										initializer.block.sourceStart,
7264
										to,
7265
										nameRequestor);
7266
								break done;
7267
							}
7268
						}
7269
					}
7270
				}
7271
			}
7272
		}
7273
		
7274
		int proposedNamesCount = proposedNames.size();
7275
		if (proposedNamesCount > 0) {
7276
			return (char[][])proposedNames.toArray(new char[proposedNamesCount][]);
7277
		}
7278
		
7279
		return null;
7280
	}
7142
		// Helper method for private void findVariableNames(char[] name, TypeReference type )
7281
		// Helper method for private void findVariableNames(char[] name, TypeReference type )
7143
	private void findVariableName(
7282
	private void findVariableName(
7144
		char[] token,
7283
		char[] token,
Lines 7531-7536 Link Here
7531
	int computeBaseRelevance(){
7670
	int computeBaseRelevance(){
7532
		return R_DEFAULT;
7671
		return R_DEFAULT;
7533
	}
7672
	}
7673
	int computeRelevanceForResolution(){
7674
		return computeRelevanceForResolution(true);
7675
	}
7676
	int computeRelevanceForResolution(boolean isResolved){
7677
		if (isResolved) {
7678
			return R_RESOLVED;
7679
		}
7680
		return 0;
7681
	}
7534
	private void computeExpectedTypes(ASTNode parent, ASTNode node, Scope scope){
7682
	private void computeExpectedTypes(ASTNode parent, ASTNode node, Scope scope){
7535
		
7683
		
7536
		// default filter
7684
		// default filter
Lines 8015-8020 Link Here
8015
	private void proposeNewMethod(char[] token, ReferenceBinding reference) {
8163
	private void proposeNewMethod(char[] token, ReferenceBinding reference) {
8016
		if(!this.requestor.isIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION)) {
8164
		if(!this.requestor.isIgnored(CompletionProposal.POTENTIAL_METHOD_DECLARATION)) {
8017
			int relevance = computeBaseRelevance();
8165
			int relevance = computeBaseRelevance();
8166
			relevance += computeRelevanceForResolution();
8018
			relevance += computeRelevanceForInterestingProposal();
8167
			relevance += computeRelevanceForInterestingProposal();
8019
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for new method
8168
			relevance += computeRelevanceForRestrictions(IAccessRule.K_ACCESSIBLE); // no access restriction for new method
8020
			
8169
			
(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java (+49 lines)
Lines 3771-3776 Link Here
3771
	
3771
	
3772
	return fakeMethod;
3772
	return fakeMethod;
3773
}
3773
}
3774
public MethodDeclaration parseStatementsBeforeCompletion(int start, int end, int fakeBlocksCount, CompilationUnitDeclaration unit) {
3775
	this.methodRecoveryActivated = true;
3776
	
3777
	initialize();
3778
3779
	// simulate goForMethodBody except that we don't want to balance brackets because they are not going to be balanced
3780
	goForBlockStatementsopt();
3781
3782
	MethodDeclaration fakeMethod = new MethodDeclaration(unit.compilationResult());
3783
	fakeMethod.selector = FAKE_METHOD_NAME;
3784
	fakeMethod.bodyStart = start;
3785
	fakeMethod.bodyEnd = end;
3786
	fakeMethod.declarationSourceStart = start;
3787
	fakeMethod.declarationSourceEnd = end;
3788
	fakeMethod.sourceStart = start;
3789
	fakeMethod.sourceEnd = start; //fake method must ignore the method header
3790
	
3791
	referenceContext = fakeMethod;
3792
	compilationUnit = unit;
3793
	
3794
	this.diet = false;
3795
	this.restartRecovery = true;
3796
	
3797
	scanner.resetTo(start, end);
3798
	consumeNestedMethod();
3799
	for (int i = 0; i < fakeBlocksCount; i++) {
3800
		consumeOpenFakeBlock();
3801
	}
3802
	try {
3803
		parse();
3804
	} catch (AbortCompilation ex) {
3805
		lastAct = ERROR_ACTION;
3806
	} finally {
3807
		nestedMethod[nestedType]--;		
3808
	}
3809
	if (!this.hasError) {
3810
		int length;
3811
		if (astLengthPtr > -1 && (length = this.astLengthStack[this.astLengthPtr--]) != 0) {
3812
			System.arraycopy(
3813
				this.astStack, 
3814
				(this.astPtr -= length) + 1, 
3815
				fakeMethod.statements = new Statement[length], 
3816
				0, 
3817
				length); 
3818
		}
3819
	}
3820
	
3821
	return fakeMethod;
3822
}
3774
/*
3823
/*
3775
 * Prepares the state of the parser to go for BlockStatements.
3824
 * Prepares the state of the parser to go for BlockStatements.
3776
 */
3825
 */

Return to bug 162865