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

Collapse All | Expand All

(-)ui/org/eclipse/jdt/ui/tests/quickfix/SurroundWithTemplateTest.java (-37 / +37 lines)
Lines 91-103 Link Here
91
		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_SUFFIXES, "");
91
		corePrefs.setValue(JavaCore.CODEASSIST_FIELD_SUFFIXES, "");
92
		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_SUFFIXES, "");
92
		corePrefs.setValue(JavaCore.CODEASSIST_STATIC_FIELD_SUFFIXES, "");
93
93
94
		fJProject1= ProjectTestSetup.getProject();
94
		this.fJProject1= ProjectTestSetup.getProject();
95
95
96
		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
96
		this.fSourceFolder= JavaProjectHelper.addSourceContainer(this.fJProject1, "src");
97
	}
97
	}
98
98
99
	protected void tearDown() throws Exception {
99
	protected void tearDown() throws Exception {
100
		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
100
		JavaProjectHelper.clear(this.fJProject1, ProjectTestSetup.getDefaultClasspath());
101
	}
101
	}
102
102
103
	private static List getRunnableProposal(AssistContext context) throws CoreException {
103
	private static List getRunnableProposal(AssistContext context) throws CoreException {
Lines 126-132 Link Here
126
126
127
	public void testSurroundWithRunnable1() throws Exception {
127
	public void testSurroundWithRunnable1() throws Exception {
128
128
129
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
129
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
130
		StringBuffer buf= new StringBuffer();
130
		StringBuffer buf= new StringBuffer();
131
		buf.append("package test1;\n");
131
		buf.append("package test1;\n");
132
		buf.append("public class E {\n");
132
		buf.append("public class E {\n");
Lines 163-169 Link Here
163
163
164
	public void testSurroundWithRunnable2() throws Exception {
164
	public void testSurroundWithRunnable2() throws Exception {
165
165
166
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
166
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
167
		StringBuffer buf= new StringBuffer();
167
		StringBuffer buf= new StringBuffer();
168
		buf.append("package test1;\n");
168
		buf.append("package test1;\n");
169
		buf.append("public class E {\n");
169
		buf.append("public class E {\n");
Lines 220-226 Link Here
220
220
221
	public void testSurroundWithRunnable3() throws Exception {
221
	public void testSurroundWithRunnable3() throws Exception {
222
222
223
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
223
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
224
		StringBuffer buf= new StringBuffer();
224
		StringBuffer buf= new StringBuffer();
225
		buf.append("package test1;\n");
225
		buf.append("package test1;\n");
226
		buf.append("public class E {\n");
226
		buf.append("public class E {\n");
Lines 281-287 Link Here
281
281
282
	public void testSurroundWithRunnable4() throws Exception {
282
	public void testSurroundWithRunnable4() throws Exception {
283
283
284
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
284
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
285
		StringBuffer buf= new StringBuffer();
285
		StringBuffer buf= new StringBuffer();
286
		buf.append("package test1;\n");
286
		buf.append("package test1;\n");
287
		buf.append("public class E {\n");
287
		buf.append("public class E {\n");
Lines 325-331 Link Here
325
325
326
	public void testSurroundWithRunnable5() throws Exception {
326
	public void testSurroundWithRunnable5() throws Exception {
327
327
328
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
328
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
329
		StringBuffer buf= new StringBuffer();
329
		StringBuffer buf= new StringBuffer();
330
		buf.append("package test1;\n");
330
		buf.append("package test1;\n");
331
		buf.append("public class E {\n");
331
		buf.append("public class E {\n");
Lines 365-371 Link Here
365
365
366
	public void testSurroundWithRunnable6() throws Exception {
366
	public void testSurroundWithRunnable6() throws Exception {
367
367
368
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
368
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
369
		StringBuffer buf= new StringBuffer();
369
		StringBuffer buf= new StringBuffer();
370
		buf.append("package test1;\n");
370
		buf.append("package test1;\n");
371
		buf.append("public class E {\n");
371
		buf.append("public class E {\n");
Lines 408-414 Link Here
408
408
409
	public void testSurroundWithRunnable7() throws Exception {
409
	public void testSurroundWithRunnable7() throws Exception {
410
410
411
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
411
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
412
		StringBuffer buf= new StringBuffer();
412
		StringBuffer buf= new StringBuffer();
413
		buf.append("package test1;\n");
413
		buf.append("package test1;\n");
414
		buf.append("public class E {\n");
414
		buf.append("public class E {\n");
Lines 447-453 Link Here
447
447
448
	public void testSurroundWithRunnable8() throws Exception {
448
	public void testSurroundWithRunnable8() throws Exception {
449
449
450
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
450
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
451
		StringBuffer buf= new StringBuffer();
451
		StringBuffer buf= new StringBuffer();
452
		buf.append("package test1;\n");
452
		buf.append("package test1;\n");
453
		buf.append("public class E {\n");
453
		buf.append("public class E {\n");
Lines 498-504 Link Here
498
498
499
	public void testSurroundWithRunnable9() throws Exception {
499
	public void testSurroundWithRunnable9() throws Exception {
500
500
501
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
501
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
502
		StringBuffer buf= new StringBuffer();
502
		StringBuffer buf= new StringBuffer();
503
		buf.append("package test1;\n");
503
		buf.append("package test1;\n");
504
		buf.append("public class E {\n");
504
		buf.append("public class E {\n");
Lines 539-545 Link Here
539
539
540
	public void testSurroundWithRunnable10() throws Exception {
540
	public void testSurroundWithRunnable10() throws Exception {
541
541
542
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
542
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
543
		StringBuffer buf= new StringBuffer();
543
		StringBuffer buf= new StringBuffer();
544
		buf.append("package test1;\n");
544
		buf.append("package test1;\n");
545
		buf.append("public class E {\n");
545
		buf.append("public class E {\n");
Lines 584-590 Link Here
584
584
585
	public void testSurroundWithRunnable11() throws Exception {
585
	public void testSurroundWithRunnable11() throws Exception {
586
586
587
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
587
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
588
		StringBuffer buf= new StringBuffer();
588
		StringBuffer buf= new StringBuffer();
589
		buf.append("package test1;\n");
589
		buf.append("package test1;\n");
590
		buf.append("public class E {\n");
590
		buf.append("public class E {\n");
Lines 624-630 Link Here
624
624
625
	public void testSurroundWithRunnable12() throws Exception {
625
	public void testSurroundWithRunnable12() throws Exception {
626
626
627
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
627
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
628
		StringBuffer buf= new StringBuffer();
628
		StringBuffer buf= new StringBuffer();
629
		buf.append("package test1;\n");
629
		buf.append("package test1;\n");
630
		buf.append("public class E {\n");
630
		buf.append("public class E {\n");
Lines 662-668 Link Here
662
662
663
	public void testSurroundWithRunnable13() throws Exception {
663
	public void testSurroundWithRunnable13() throws Exception {
664
664
665
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
665
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
666
		StringBuffer buf= new StringBuffer();
666
		StringBuffer buf= new StringBuffer();
667
		buf.append("package test1;\n");
667
		buf.append("package test1;\n");
668
		buf.append("public class E {\n");
668
		buf.append("public class E {\n");
Lines 704-710 Link Here
704
704
705
	public void testSurroundWithRunnable14() throws Exception {
705
	public void testSurroundWithRunnable14() throws Exception {
706
706
707
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
707
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
708
		StringBuffer buf= new StringBuffer();
708
		StringBuffer buf= new StringBuffer();
709
		buf.append("package test1;\n");
709
		buf.append("package test1;\n");
710
		buf.append("public class E {\n");
710
		buf.append("public class E {\n");
Lines 744-750 Link Here
744
744
745
	public void testSurroundWithRunnable15() throws Exception {
745
	public void testSurroundWithRunnable15() throws Exception {
746
746
747
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
747
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
748
		StringBuffer buf= new StringBuffer();
748
		StringBuffer buf= new StringBuffer();
749
		buf.append("package test1;\n");
749
		buf.append("package test1;\n");
750
		buf.append("public class E {\n");
750
		buf.append("public class E {\n");
Lines 788-794 Link Here
788
788
789
	public void testSurroundWithRunnable16() throws Exception {
789
	public void testSurroundWithRunnable16() throws Exception {
790
790
791
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
791
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
792
		StringBuffer buf= new StringBuffer();
792
		StringBuffer buf= new StringBuffer();
793
		buf.append("package test1;\n");
793
		buf.append("package test1;\n");
794
		buf.append("public class E {\n");
794
		buf.append("public class E {\n");
Lines 829-835 Link Here
829
829
830
	public void testSurroundWithRunnable17() throws Exception {
830
	public void testSurroundWithRunnable17() throws Exception {
831
831
832
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
832
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
833
		StringBuffer buf= new StringBuffer();
833
		StringBuffer buf= new StringBuffer();
834
		buf.append("package test1;\n");
834
		buf.append("package test1;\n");
835
		buf.append("public class E {\n");
835
		buf.append("public class E {\n");
Lines 869-875 Link Here
869
869
870
	public void testSurroundWithRunnable18() throws Exception {
870
	public void testSurroundWithRunnable18() throws Exception {
871
871
872
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
872
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
873
		StringBuffer buf= new StringBuffer();
873
		StringBuffer buf= new StringBuffer();
874
		buf.append("package test1;\n");
874
		buf.append("package test1;\n");
875
		buf.append("public class E {\n");
875
		buf.append("public class E {\n");
Lines 909-915 Link Here
909
909
910
	public void testSurroundWithRunnable19() throws Exception {
910
	public void testSurroundWithRunnable19() throws Exception {
911
911
912
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
912
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
913
		StringBuffer buf= new StringBuffer();
913
		StringBuffer buf= new StringBuffer();
914
		buf.append("package test1;\n");
914
		buf.append("package test1;\n");
915
		buf.append("public class E {\n");
915
		buf.append("public class E {\n");
Lines 952-958 Link Here
952
952
953
	public void testSurroundWithRunnable20() throws Exception {
953
	public void testSurroundWithRunnable20() throws Exception {
954
954
955
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
955
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
956
		StringBuffer buf= new StringBuffer();
956
		StringBuffer buf= new StringBuffer();
957
		buf.append("package test1;\n");
957
		buf.append("package test1;\n");
958
		buf.append("public class E {\n");
958
		buf.append("public class E {\n");
Lines 993-999 Link Here
993
993
994
	public void testSurroundWithRunnable21() throws Exception {
994
	public void testSurroundWithRunnable21() throws Exception {
995
995
996
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
996
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
997
		StringBuffer buf= new StringBuffer();
997
		StringBuffer buf= new StringBuffer();
998
		buf.append("package test1;\n");
998
		buf.append("package test1;\n");
999
		buf.append("public class E {\n");
999
		buf.append("public class E {\n");
Lines 1035-1041 Link Here
1035
1035
1036
	public void testSurroundWithRunnable22() throws Exception {
1036
	public void testSurroundWithRunnable22() throws Exception {
1037
1037
1038
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1038
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1039
		StringBuffer buf= new StringBuffer();
1039
		StringBuffer buf= new StringBuffer();
1040
		buf.append("package test1;\n");
1040
		buf.append("package test1;\n");
1041
		buf.append("public class E {\n");
1041
		buf.append("public class E {\n");
Lines 1085-1091 Link Here
1085
1085
1086
	public void testSurroundWithRunnable23() throws Exception {
1086
	public void testSurroundWithRunnable23() throws Exception {
1087
1087
1088
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1088
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1089
		StringBuffer buf= new StringBuffer();
1089
		StringBuffer buf= new StringBuffer();
1090
		buf.append("package test1;\n");
1090
		buf.append("package test1;\n");
1091
		buf.append("public class E {\n");
1091
		buf.append("public class E {\n");
Lines 1126-1132 Link Here
1126
1126
1127
	public void testSurroundWithRunnable24() throws Exception {
1127
	public void testSurroundWithRunnable24() throws Exception {
1128
1128
1129
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1129
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1130
		StringBuffer buf= new StringBuffer();
1130
		StringBuffer buf= new StringBuffer();
1131
		buf.append("package test1;\n");
1131
		buf.append("package test1;\n");
1132
		buf.append("public class E {\n");
1132
		buf.append("public class E {\n");
Lines 1274-1280 Link Here
1274
1274
1275
	public void testSurroundWithRunnable27() throws Exception {
1275
	public void testSurroundWithRunnable27() throws Exception {
1276
1276
1277
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1277
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1278
		StringBuffer buf= new StringBuffer();
1278
		StringBuffer buf= new StringBuffer();
1279
		buf.append("package test1;\n");
1279
		buf.append("package test1;\n");
1280
		buf.append("public class E {\n");
1280
		buf.append("public class E {\n");
Lines 1314-1320 Link Here
1314
1314
1315
	public void testSurroundWithRunnable28() throws Exception {
1315
	public void testSurroundWithRunnable28() throws Exception {
1316
1316
1317
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1317
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1318
		StringBuffer buf= new StringBuffer();
1318
		StringBuffer buf= new StringBuffer();
1319
		buf.append("package test1;\n");
1319
		buf.append("package test1;\n");
1320
		buf.append("public class E {\n");
1320
		buf.append("public class E {\n");
Lines 1359-1365 Link Here
1359
1359
1360
	public void testSurroundWithRunnable29() throws Exception {
1360
	public void testSurroundWithRunnable29() throws Exception {
1361
1361
1362
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1362
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1363
		StringBuffer buf= new StringBuffer();
1363
		StringBuffer buf= new StringBuffer();
1364
		buf.append("package test1;\n");
1364
		buf.append("package test1;\n");
1365
		buf.append("public class E {\n");
1365
		buf.append("public class E {\n");
Lines 1406-1412 Link Here
1406
1406
1407
	public void testSurroundWithRunnable30() throws Exception {
1407
	public void testSurroundWithRunnable30() throws Exception {
1408
1408
1409
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1409
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1410
		StringBuffer buf= new StringBuffer();
1410
		StringBuffer buf= new StringBuffer();
1411
		buf.append("package test;\n");
1411
		buf.append("package test;\n");
1412
		buf.append("public class E {\n");
1412
		buf.append("public class E {\n");
Lines 1444-1450 Link Here
1444
1444
1445
	public void testSurroundWithRunnableBug133560() throws Exception {
1445
	public void testSurroundWithRunnableBug133560() throws Exception {
1446
1446
1447
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1447
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1448
		StringBuffer buf= new StringBuffer();
1448
		StringBuffer buf= new StringBuffer();
1449
		buf.append("package test1;\n");
1449
		buf.append("package test1;\n");
1450
		buf.append("public class E {\n");
1450
		buf.append("public class E {\n");
Lines 1483-1489 Link Here
1483
1483
1484
	public void testSurroundWithRunnableBug233278() throws Exception {
1484
	public void testSurroundWithRunnableBug233278() throws Exception {
1485
1485
1486
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1486
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1487
		StringBuffer buf= new StringBuffer();
1487
		StringBuffer buf= new StringBuffer();
1488
		buf.append("package test1;\n");
1488
		buf.append("package test1;\n");
1489
		buf.append("public class E {\n");
1489
		buf.append("public class E {\n");
Lines 1534-1540 Link Here
1534
1534
1535
	public void testSurroundWithRunnableBug138323() throws Exception {
1535
	public void testSurroundWithRunnableBug138323() throws Exception {
1536
1536
1537
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1537
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1538
		StringBuffer buf= new StringBuffer();
1538
		StringBuffer buf= new StringBuffer();
1539
		buf.append("package test1;\n");
1539
		buf.append("package test1;\n");
1540
		buf.append("public class E<I> {\n");
1540
		buf.append("public class E<I> {\n");
Lines 1569-1575 Link Here
1569
1569
1570
	public void testSurroundWithBug162549() throws Exception {
1570
	public void testSurroundWithBug162549() throws Exception {
1571
1571
1572
		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
1572
		IPackageFragment pack1= this.fSourceFolder.createPackageFragment("test1", false, null);
1573
		StringBuffer buf= new StringBuffer();
1573
		StringBuffer buf= new StringBuffer();
1574
		buf.append("package test1;\n");
1574
		buf.append("package test1;\n");
1575
		buf.append("public class E {\n");
1575
		buf.append("public class E {\n");
Lines 1605-1612 Link Here
1605
		buf.append("                if (true) {\n");
1605
		buf.append("                if (true) {\n");
1606
		buf.append("                    System.out.println(\"T\");\n");
1606
		buf.append("                    System.out.println(\"T\");\n");
1607
		buf.append("                } // else {\n");
1607
		buf.append("                } // else {\n");
1608
		buf.append("                // System.out.println(\"F\");\n");
1608
		buf.append("                  // System.out.println(\"F\");\n");
1609
		buf.append("                // }\n");
1609
		buf.append("                  // }\n");
1610
		buf.append("            }\n");
1610
		buf.append("            }\n");
1611
		buf.append("        };\n");
1611
		buf.append("        };\n");
1612
		buf.append("    }\n");
1612
		buf.append("    }\n");

Return to bug 293300