Skip to main content
summaryrefslogtreecommitdiffstats
blob: fcc1d3bfbee5f1ffcf337241691d9ccf96aa7b67 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
/*******************************************************************************
 * Copyright (c) 2004, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 * IBM Corporation - initial API and implementation
 * yyyymmdd bug      Email and other contact information
 * -------- -------- -----------------------------------------------------------
 * 20060407   135415 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060407   135443 joan@ca.ibm.com - Joan Haggarty
 * 20060410   135442 kathy@ca.ibm.com - Kathy Chan
 * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
 * 20060410   135562 joan@ca.ibm.com - Joan Haggarty
 * 20060411   136167 kathy@ca.ibm.com - Kathy Chan
 * 20060417   136390/136391/136159 joan@ca.ibm.com - Joan Haggarty
 * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060420   136158 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060420   136705 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060420   136182 kathy@ca.ibm.com - Kathy Chan
 * 20060420   137820 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
 * 20060421   136761 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060424   138052 kathy@ca.ibm.com - Kathy Chan
 * 20060425   137831 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060426   138519 joan@ca.ibm.com - Joan Haggarty
 * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
 * 20060504   138035 joan@ca.ibm.com - Joan Haggarty
 * 20060524   142276 joan@ca.ibm.com - Joan Haggarty
 * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
 * 20060605   145081 joan@ca.ibm.com - Joan Haggarty
 * 20060607   144826 joan@ca.ibm.com - Joan Haggarty
 * 20060607   144049 joan@ca.ibm.com - Joan Haggarty
 * 20060614   146270 joan@ca.ibm.com - Joan Haggarty
 * 20060616   147317 joan@ca.ibm.com - Joan Haggarty
 * 20060717   150577 makandre@ca.ibm.com - Andrew Mak
 * 20060726   150865 sengpl@ca.ibm.com -  Seng Phung-Lu
 * 20060803   152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
 * 20060817   140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
 * 20060825   135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
 * 20060829   155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
 * 20060830   155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
 * 20060831   155441 makandre@ca.ibm.com - Andrew Mak, Small tweak for this bug
 * 20061003   159142 kathy@ca.ibm.com - Kathy Chan
 * 20061212   164177 makandre@ca.ibm.com - Andrew Mak, Incorrect validation error complaining about runtime not supporting a project type
 * 20061212   159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
 * 20070205   172687 makandre@ca.ibm.com - Andrew Mak, NPE in Scencario Defaults preferences page
 * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
 * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
 * 20080215   216337 pmoogk@ca.ibm.com - Peter Moogk
 * 20080301   221034 kathy@ca.ibm.com - Kathy Chan
 * 20080312   147442 trungha@ca.ibm.com - Trung Ha
 * 20080318   213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
 * 20080326   198439 kathy@ca.ibm.com - Kathy Chan
 * 20080402   198439 kathy@ca.ibm.com - Kathy Chan
 * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
 * 20080417   227599 kathy@ca.ibm.com - Kathy Chan
 * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
 * 20090926   248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names
 *******************************************************************************/
package org.eclipse.jst.ws.internal.creation.ui.widgets;


import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.ProjectSelectionDialog;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.IObjectSelectionWidget;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.Timer;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
import org.eclipse.jst.ws.internal.context.ScenarioContext;
import org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin;
import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
import org.eclipse.jst.ws.internal.data.LabelsAndIds;
import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
import org.eclipse.jst.ws.internal.ui.common.UIUtils;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.Accessible;
import org.eclipse.swt.accessibility.AccessibleAdapter;
import org.eclipse.swt.accessibility.AccessibleControlAdapter;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Scale;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.HyperlinkGroup;
import org.eclipse.ui.forms.HyperlinkSettings;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;

public class ServerWizardWidget extends SimpleWidgetDataContributor implements Runnable, IPackable {
	
	//INFOPOPS
    /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */
	private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001";
	 /* CONTEXT_ID WSWSCEN0010 for the Web Service Type combo box of the Scenario Page */
	 private String INFOPOP_WSWSCEN_COMBO_SERVICETYPE = "WSWSCEN0010";
	 /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */
	 private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014";
	 /* CONTEXT_ID WSWSCEN0012 for the Launch UDDI check box of the Scenario Page */
	 private String INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS = "WSWSCEN0012";
	 /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */
	 private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020";
	 /* CONTEXT_ID WSWSCEN0021 for theService Slider of the Scenario Page */
	 private String INFOPOP_WSWSCEN_SCALE_SERVICE = "WSWSCEN0021";
	 /* CONTEXT_ID WSWSCEN0022 for the Server hyperlink of the Scenario Page */
	 private String INFOPOP_WSWSCEN_HYPERLINK_SERVER = "WSWSCEN0022";
	 /* CONTEXT_ID WSWSCEN0023 for the Runtime hyperlink of the Scenario Page */
	 private String INFOPOP_WSWSCEN_HYPERLINK_RUNTIME = "WSWSCEN0023";
	 /* CONTEXT_ID WSWSCEN0024 for theProjects hyperlink of the Scenario Page */
	 private String INFOPOP_WSWSCEN_HYPERLINK_PROJECTS  = "WSWSCEN0024";
	 /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */
	 private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030";
	 
	private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener();
	private Listener statusListener_;
	private ModifyListener objectModifyListener_ ;
	private int validationState_;
	boolean validObjectSelection_ = true;

	private ImageRegistry imageReg_;
	
	private TypeRuntimeServer ids_;
	private LabelsAndIds labelIds_;
	private String serviceProjectName_;
	private IProject initialProject_;
	private String serviceEarProjectName_;
	private String serviceComponentType_;
	private WebServicesParser parser_;
	private boolean needEar_;
		 
	private boolean developService_;
	private boolean assembleService_;
	private boolean deployService_;
	
	private IStructuredSelection objectSelection_;
	private Boolean testService_;
	private Boolean startService_;
	private Boolean installService_;

	private boolean displayPreferences_;
	private boolean preferencesPage_;

	private Composite groupComposite_;
	private Composite hCompService_;	
	private WebServiceClientTypeWidget clientWidget_;
    private Label serviceLabel_;
	private Combo webserviceType_;
	private Text serviceImpl_;
	private Scale serviceScale_;
	private Label topologySpot_;
	private Button browseButton_;
	private Button publishButton_;
	private Button monitorButton_;
	private Button overwriteButton_;	
	private ServiceImplSelectionDialog browseDialog_;
	private ProjectSelectionDialog projectDialog_;
	private Hyperlink hLinkServiceRuntime_;
	private Hyperlink hLinkServiceServer_;
	private Hyperlink hLinkServiceProject_;
	private Hyperlink hLinkServiceEAR_;
		
	private Object objectSelectionWidget_; //may be IObjectSelectionLaunchable or IObjectSelectionWidget
	
	private ResourceContext resourceContext_;
	
	private Timer timer_ = null;
		
	private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.creation.ui");
	
	private boolean forceRefreshRuntime = false;
	
	private String GRAPHIC_SERVICE_0="icons/service_test.jpg"; //$NON-NLS-N$
	private String GRAPHIC_SERVICE_1="icons/service_run.jpg";  //$NON-NLS-N$
	private String GRAPHIC_SERVICE_2="icons/service_install.jpg"; //$NON-NLS-N$
	private String GRAPHIC_SERVICE_3="icons/service_deploy.jpg"; //$NON-NLS-N$
	private String GRAPHIC_SERVICE_4="icons/service_assemble.jpg"; //$NON-NLS-N$
	private String GRAPHIC_SERVICE_5="icons/service_develop.jpg"; //$NON-NLS-N$
		
	private String ICON_SCALE_BG_0="icons/scale0_bground.jpg"; //$NON-NLS-N$
	private String ICON_SCALE_BG_1="icons/scale1_bground.jpg"; //$NON-NLS-N$
	private String ICON_SCALE_BG_2="icons/scale2_bground.jpg"; //$NON-NLS-N$
	private String ICON_SCALE_BG_3="icons/scale3_bground.jpg"; //$NON-NLS-N$
	private String ICON_SCALE_BG_4="icons/scale4_bground.jpg"; //$NON-NLS-N$
	private String ICON_SCALE_BG_5="icons/scale5_bground.jpg"; //$NON-NLS-N$
	private String ICON_SCALE_BG_6="icons/scale6_bground.jpg"; //$NON-NLS-N$

	private String SERVICE_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ; 
    private String SERVICE_SERVER_PREFIX =  ConsumptionUIMessages.LABEL_SERVERS_LIST;
    private String SERVICE_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_PROJECT;
    private String SERVICE_EAR_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT;
    
    /**
     * @param displayPreferences Set to true if preferences such as overwrite should be displayed on the wizard page
     * @param prefPage  Set to true if the widget is being used on the preferences page.  Alters widget layout.
     */
	public ServerWizardWidget(boolean displayPreferences, boolean prefPage) {
		displayPreferences_ = displayPreferences;
		preferencesPage_ = prefPage;
		initImageRegistry();
		validationState_ = ValidationUtils.VALIDATE_ALL;
	}
	
	private Composite serviceComposite_;
	
	/**
	 * Run this ServerWizardWidget, which validates the entry field values.
	 */
	public void run() {
		
		// do minimal check here, this call will determine if we at least
		// have a "validObjectSelection_"
		checkServiceImplTextStatus();
		
		if (validObjectSelection_)
		{
			boolean refreshRuntime = (getWebServiceScenario() != WebServiceScenario.TOPDOWN); 
			
			if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
		       {
				IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
				callObjectTransformation(launchable.getObjectSelection(), launchable.getProject(), launchable.getComponentName(), refreshRuntime);								
		       }
			else 
			{
				IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
				callObjectTransformation(widget.getObjectSelection(), widget.getProject(), widget.getComponentName(), refreshRuntime);
		    }	
		}
		else
			setObjectSelection(null);
		
		// do full validation after all transformations and calculations have occurred
		validationState_ = ValidationUtils.VALIDATE_ALL;
		statusListener_.handleEvent(null);		
	}
	
	/**
	 * Pack this widget and the client-side widget as well. 
	 */
	private void packSelf() {
		// don't need to call packIt(), since clientWidget_ has a callback to packIt() already.
		clientWidget_.packIt();
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt()
	 */
	public void packIt() {		
		groupComposite_.pack(true);
		utils_.horizontalResize(groupComposite_.getShell(), groupComposite_, UIUtils.DEFAULT_PADDING);
	}
	
	public WidgetDataEvents addControls(Composite parent,
			Listener statusListener) {
				
		statusListener_ = statusListener;
		utils_.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE);
		
		Composite typeComposite = utils_.createComposite(parent, 3);

		webserviceType_ = utils_.createCombo(typeComposite,
				ConsumptionUIMessages.LABEL_WEBSERVICETYPE,
				ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_TYPE,
				INFOPOP_WSWSCEN_COMBO_SERVICETYPE, SWT.SINGLE | SWT.BORDER
						| SWT.READ_ONLY);
		GridData gdata1 = (GridData) webserviceType_.getLayoutData();
		gdata1.horizontalSpan = 2;
		webserviceType_.setLayoutData(gdata1);
		
		webserviceType_.addSelectionListener(new SelectionListener(){
			public void widgetDefaultSelected(SelectionEvent e) {}
			
			public void widgetSelected(SelectionEvent e) {
				String oldTypeId = ids_.getTypeId();
				int currentSelectionIdx = webserviceType_.getSelectionIndex();
				String currentTypeId = labelIds_.getIds_()[currentSelectionIdx];
				if (!oldTypeId.equals(currentTypeId)) {					
					ids_.setTypeId(currentTypeId);
					
					// don't need to refresh runtime or validate fields if we are on the preference page, just return
					if (preferencesPage_)
						return;
						
					int oldScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(oldTypeId);
					int currentScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(currentTypeId);

			      objectSelectionWidget_ = getSelectionWidget();
					// change the label for the service
					// implementation/definition based on the web service type
					handleTypeChange();					

					// After bug 159911, we will not refresh the runtime in TOPDOWN scenario unless we absolutely
					// have to.  Therefore, if we are switching from another scenario type, we should check if the 
					// current selections are valid for this TOPDOWN scenario, if not, try to pick a more suitable 
					// runtime.
					if (currentScenario == WebServiceScenario.TOPDOWN) {
						validationState_ = ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES;
						
						// this will force a refresh the next time the wsdl is changed
						forceRefreshRuntime = !checkErrorStatus().isOK();
					}
					
					//if the web service type change is from one top-down type to another
					//top-down type leave the object selection field in tact and refresh
					//the server/runtime project defaulting.
					//Otherwise clear the object selection field since it's value is not valid anymore
					if (oldScenario==WebServiceScenario.TOPDOWN && currentScenario==WebServiceScenario.TOPDOWN)						
					{
						// if switching from one TOPDOWN scenario to another TOPDOWN scenario and
						// we've determined that the current runtime selection is not suitable, we 
						// can refresh the runtime now (don't need to wait for the next time the
						// wsdl is changed).
						if (forceRefreshRuntime) {
							refreshServerRuntimeSelection();
							forceRefreshRuntime = false;
						}
					}
					else
					{
						//clear the object selection field
						// serviceImpl may be null if on the preferences page
						if (serviceImpl_ != null)
						{
							serviceImpl_.removeModifyListener(objectModifyListener_);
							serviceImpl_.setText("");
							setObjectSelection(null);
							serviceImpl_.addModifyListener(objectModifyListener_);
						}						   
					}					
			   validationState_ = ValidationUtils.VALIDATE_ALL;
			   statusListener_.handleEvent(null);			   
					
			}
		  }
			
		});
		
		// Create text field and browse for object selection if not on preferences page
		if (!preferencesPage_)
		{
			//text of this label is based on the web service type selected in webserviceType_ combo
			serviceLabel_ = new Label( typeComposite, SWT.WRAP);
			serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
			serviceLabel_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);

			serviceImpl_ = new Text(typeComposite, SWT.LEFT | SWT.BORDER );
			GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
			griddata.widthHint = 225;
			serviceImpl_.setLayoutData( griddata );
			serviceImpl_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
			utils_.createInfoPop(serviceImpl_, INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL);
			
			objectModifyListener_ = new ModifyListener(){
				public void modifyText(ModifyEvent e) {
				    if (serviceImpl_.getText().indexOf(':') > 0) {
				        timer_ = Timer.newInstance(timer_, Display.getCurrent(), ServerWizardWidget.this);
				        timer_.startTimer();
				    }
				    else
				        run();
				}
			};
			
			serviceImpl_.addModifyListener(objectModifyListener_);

			browseButton_ = utils_.createPushButton(typeComposite,
					ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);

			IWorkbench workbench = PlatformUI.getWorkbench();
			browseDialog_ = new ServiceImplSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), 
					new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "", 
							new WidgetContributorFactory()
					{	
						public WidgetContributor create()
						{	  						 
							return new ObjectSelectionWidget();
						}
					}));		
			browseButton_.addSelectionListener(new ServiceImplBrowseListener());
		}
		// Service Lifecycle section - scales for service & client, graphic
		
		groupComposite_ = new Composite(parent, SWT.NONE);
		GridLayout gclayout = new GridLayout();
		gclayout.numColumns = 2;
		gclayout.horizontalSpacing=0;		
		gclayout.marginHeight=0;		
		gclayout.marginBottom=5;
		groupComposite_.setLayout( gclayout );
	    GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
	    groupComposite_.setLayoutData(gcGridData);		
	    
	    groupComposite_.addControlListener(new ControlListener()
		{
			public void controlMoved(ControlEvent e) {
				// TODO Auto-generated method stub
				
			}
			public void controlResized(ControlEvent e) {
				groupComposite_.pack(true);				
			}
		});
	    
		serviceComposite_ =  new Composite(groupComposite_, SWT.NONE);
		GridLayout gridlayout   = new GridLayout();
	    gridlayout.numColumns   = 2;
	    gridlayout.horizontalSpacing=0;
	    gridlayout.marginHeight=0;
	    serviceComposite_.setLayout( gridlayout );
	    GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
	    serviceComposite_.setLayoutData(scGridData);    
	    
		serviceComposite_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
	
		
		serviceScale_ = new Scale(serviceComposite_, SWT.VERTICAL | SWT.BORDER);
	    utils_.createInfoPop(serviceScale_, INFOPOP_WSWSCEN_SCALE_SERVICE);
		serviceScale_.setMinimum(0);
		serviceScale_.setMaximum(6);
		serviceScale_.setIncrement(1);
		serviceScale_.setPageIncrement(1);
		serviceScale_.addSelectionListener(scaleSelectionListener);
		serviceScale_.setSelection(getServiceGeneration());
		serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
		
		Accessible accessibleScale = serviceScale_.getAccessible();
		accessibleScale.addAccessibleListener(new AccessibleAdapter(){
			//	return a string that describes what to do with the slider
			//  this is read by the screen reader when the slider first gets focus
			public void getName(AccessibleEvent e) {
				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE;			
			}			
		});
		accessibleScale.addAccessibleControlListener(new AccessibleControlAdapter(){
			// return a meaningful string when the screen reader
			// attempts to get the value from the service scale
			public void getValue(AccessibleControlEvent e) {
				int selection = serviceScale_.getSelection();
				switch (selection) {
				case 0:
					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST;
					break;
				case 1:
					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN;
					break;
				case 2:
					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL;
					break;
				case 3:
					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY;
					break;
				case 4:
					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
					break;
				case 5:					
				case 6:
					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP;
					break;
				default:
					break;
				}								
			}
		});	
		
		GridData layoutData1 = new GridData();
		layoutData1.horizontalAlignment=SWT.CENTER;
		layoutData1.verticalAlignment = SWT.BEGINNING;
		Rectangle scaleR = (imageReg_.get(ICON_SCALE_BG_0)).getBounds();
		layoutData1.heightHint=scaleR.height;
		layoutData1.widthHint=scaleR.width+1;
		serviceScale_.setLayoutData(layoutData1);		
		
		topologySpot_ = new Label(serviceComposite_, SWT.BORDER | SWT.TOP );
		topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
		topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
		
		GridData layoutData2 = new GridData();		
		layoutData2.horizontalAlignment=SWT.BEGINNING;				
		layoutData2.verticalAlignment = SWT.BEGINNING;
		Rectangle topR = (imageReg_.get(GRAPHIC_SERVICE_0)).getBounds();
		layoutData2.heightHint=topR.height;
		layoutData2.widthHint=topR.width;
		topologySpot_.setLayoutData(layoutData2);		
				
		setGraphics(getServiceGeneration());
		
		hCompService_ = utils_.createComposite(groupComposite_, 1);
		
		Label serviceDetailsLabel = new Label(hCompService_, SWT.NONE);
		serviceDetailsLabel.setText(ConsumptionUIMessages.LABEL_SUMMARY);
		
		hLinkServiceServer_= new Hyperlink(hCompService_, SWT.NULL);
		utils_.createInfoPop(hLinkServiceServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER);
		hLinkServiceServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER);
		hLinkServiceServer_.addHyperlinkListener(new IHyperlinkListener(){
			public void linkActivated(HyperlinkEvent e){				
				launchRuntimeSelectionDialog(false, true);				
			}
			public void linkEntered(HyperlinkEvent e){}
			public void linkExited(HyperlinkEvent e){}			
		});

		hLinkServiceRuntime_ = new Hyperlink(hCompService_, SWT.NULL);
		utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME);
		hLinkServiceRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME);
		hLinkServiceRuntime_.addHyperlinkListener(new IHyperlinkListener(){
			public void linkActivated(HyperlinkEvent e){
								launchRuntimeSelectionDialog(false);
			}
			public void linkEntered(HyperlinkEvent e){}
			public void linkExited(HyperlinkEvent e){}			
		});
		
		IWorkbench workbench = PlatformUI.getWorkbench();
		projectDialog_ = new ProjectSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), 
				new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_PROJECT_SETTINGS, "", 
                        new WidgetContributorFactory()
  						{	
  							public WidgetContributor create()
  							{	  						 
  							   return new ProjectSelectionWidget();
  							}
  						}));
		
		hLinkServiceProject_= new Hyperlink(hCompService_, SWT.NULL);
		utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
		hLinkServiceProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
		hLinkServiceProject_.addHyperlinkListener(new IHyperlinkListener(){
			public void linkActivated(HyperlinkEvent e){
				launchProjectDialog();				
			}
			public void linkEntered(HyperlinkEvent e){}
			public void linkExited(HyperlinkEvent e){}			
		});
		
		hLinkServiceEAR_= new Hyperlink(hCompService_, SWT.NULL);
		utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
		hLinkServiceEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
		hLinkServiceEAR_.addHyperlinkListener(new IHyperlinkListener(){
			public void linkActivated(HyperlinkEvent e){
				launchProjectDialog();			
			}
			public void linkEntered(HyperlinkEvent e){}
			public void linkExited(HyperlinkEvent e){}			
		});		

		hLinkServiceServer_.setText(SERVICE_SERVER_PREFIX); 
		hLinkServiceRuntime_.setText(SERVICE_RUNTIME_PREFIX);
		hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX);
		hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX);
		
		HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent());
		
		serverRuntimeGroup.add(hLinkServiceServer_);
		serverRuntimeGroup.add(hLinkServiceRuntime_);
		serverRuntimeGroup.add(hLinkServiceProject_);
		serverRuntimeGroup.add(hLinkServiceEAR_);
		serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS);
    
		utils_.createHorizontalSeparator(parent, 1);		
		
		// Add client widgets...
		clientWidget_ = new WebServiceClientTypeWidget(false);
	    clientWidget_.addControls(parent, statusListener );
	    clientWidget_.setPackable(this);
	    clientWidget_.enableClientSlider(serviceScale_.getSelection()<=ScenarioContext.WS_START);
		
		// Advanced buttons section
		utils_.createHorizontalSeparator(parent, 3);
		
		Composite advancedButtonPanel = utils_.createComposite(parent, 1);
		
		publishButton_ = utils_.createCheckbox(advancedButtonPanel,
				ConsumptionUIMessages.BUTTON_WSWSCEN_PUBLISH, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS, INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS);		
		monitorButton_ = utils_.createCheckbox(advancedButtonPanel,
				ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE);

		if (displayPreferences_ && getResourceContext().isOverwriteFilesEnabled()) {
			utils_.createHorizontalSeparator(parent, 1);			
			Composite prefButtonPanel = utils_.createComposite(parent, 1);
			overwriteButton_ = utils_.createCheckbox(prefButtonPanel,
					ConsumptionUIMessages.CHECKBOX_OVERWRITE_FILES, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES, INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE);
			overwriteButton_.setSelection(getResourceContext()
					.isOverwriteFilesEnabled());
			overwriteButton_.addSelectionListener(new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {
					getResourceContext().setOverwriteFilesEnabled(overwriteButton_.getSelection());
				}
			});
		}

		return this;
	}	
	
	private void launchProjectDialog()
	{
		String currentProjectName = getServiceProjectName();
		String currentEarProjectName = getServiceEarProjectName();
		String currentProjectType = getServiceComponentType();
		boolean currentNeedEar = getServiceNeedEAR();
		
		projectDialog_.setProjectName(currentProjectName);
		projectDialog_.setEarProjectName(currentEarProjectName);
		projectDialog_.setProjectComponentType(currentProjectType);
		projectDialog_.setNeedEAR(currentNeedEar);
		
		int status = projectDialog_.open();
		if (status == Window.OK)
		{
			String newProjectName = projectDialog_.getProjectName();
			String newEarProjectName = projectDialog_.getEarProjectName();
			String newProjectType = projectDialog_.getProjectComponentType();
			boolean newNeedEar = projectDialog_.getNeedEAR();	
			
			//Update project settings and validate page if selections changed.
			if (!newProjectName.equals(currentProjectName)
					|| !newEarProjectName.equals(currentEarProjectName)
					|| !newProjectType.equals(currentProjectType)
					|| newNeedEar != currentNeedEar) {
				setServiceProjectName(newProjectName);
				setServiceEarProjectName(newEarProjectName);
				setServiceComponentType(newProjectType);
				setServiceNeedEAR(newNeedEar);				
				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES);
				statusListener_.handleEvent(null);
			}
			
			/*check to see if text has changed for project and EAR
			if so, repaint links */
			if (!newProjectName.equals(currentProjectName))
			{
				hLinkServiceProject_.pack(true);
				packSelf();	 
			}
			if (!newEarProjectName.equals(currentEarProjectName))
			{
				hLinkServiceEAR_.pack(true);
				packSelf();	  					
			}
		}
	}
		
	private void launchRuntimeSelectionDialog(boolean clientContext)
	{
		launchRuntimeSelectionDialog(clientContext, false);
	}
		
	private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst) 	
	{	
		byte mode = clientContext ? (byte)1 : (byte)0;
		
		//TODO: jvh - investigate - don't think j2ee version shouldn't be hard coded (last parm) 
		//  question - where to pick it up from?
		//Remember the current values
		TypeRuntimeServer currentServiceTRS = getServiceTypeRuntimeServer();
		IWorkbench workbench = PlatformUI.getWorkbench();
		RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog(
				workbench.getActiveWorkbenchWindow().getShell(), mode, currentServiceTRS, "14");	
		rssd.setSelectServerFirst(selectServerFirst);		
		int result = rssd.open();		
		if (result == Window.OK)
		{
			TypeRuntimeServer newServiceTRS = rssd.getTypeRuntimeServer();
			if (!currentServiceTRS.equals(newServiceTRS))
			{
				setServiceTypeRuntimeServer(newServiceTRS);	
				refreshClientServerRuntimeSelection();	
				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
				clientWidget_.setValidationState(ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
				statusListener_.handleEvent(null); //Revalidate the page since server/runtime selections changed.
			}
			
		}		
	}	
	
	public void setClientTypeRuntimeServer(TypeRuntimeServer ids) {
		clientWidget_.setTypeRuntimeServer( ids );
	}

	public TypeRuntimeServer getClientTypeRuntimeServer() {
		return clientWidget_.getTypeRuntimeServer();
	}

	public void setInstallClient(Boolean install) {
		clientWidget_.setInstallClient( install );
	}

	public Boolean getInstallClient() {		
		return clientWidget_.getInstallClient();
	}
	
	public void setStartClient(Boolean startClient) {
		clientWidget_.setStartClient( startClient );
	}

	public Boolean getStartClient() {		
		return clientWidget_.getStartClient();
	}
	
	public void setTestClient(Boolean testClient) {
		clientWidget_.setTestClient( testClient );
	}

	public Boolean getTestClient() {		
		return clientWidget_.getTestClient();
	}
	
	public void setDevelopClient(boolean develop) {
		clientWidget_.setDevelopClient( develop );
	}

	public boolean getDevelopClient() {		
		return clientWidget_.getDevelopClient();
	}
	
	public void setAssembleClient(boolean assemble) {
		clientWidget_.setAssembleClient( assemble );
	}

	public boolean getAssembleClient() {		
		return clientWidget_.getAssembleClient();
	}
	
	public void setDeployClient(boolean deploy) {
		clientWidget_.setDeployClient( deploy );
	}

	public boolean getDeployClient() {		
		return clientWidget_.getDeployClient();
	}

private void handleTypeChange()
	{
		if (!preferencesPage_) {
		   int scenario = getWebServiceScenario();
		   
		   if (scenario == WebServiceScenario.BOTTOMUP)
		   {
			  serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
		   }
		   else if (scenario == WebServiceScenario.TOPDOWN)
		   {
			   serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEDEF);
		   }
		}
	}

	public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) {
		LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2
				.getServiceTypeLabels();
		// rskreg
		int selection = 0;
		String[] serviceIds = labelIds.getIds_();
		String selectedId = ids.getTypeId();

		webserviceType_.setItems(labelIds.getLabels_());

		// Now find the selected one.
		for (int index = 0; index < serviceIds.length; index++) {
			if (selectedId.equals(serviceIds[index])) {
				selection = index;
				break;
			}
		}
		webserviceType_.select(selection);
		
		ids_ = ids;
		
		if (ids_ != null)
		{
			String serviceServerText = "";
			String serverId = ids_.getServerId();
			if (serverId != null && serverId.length()>0)
			{
			  serviceServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
			}
			String serviceRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId());
			
			String currentServerText = hLinkServiceServer_.getText();
			String currentRuntimeText = hLinkServiceRuntime_.getText();
			String newServerText = SERVICE_SERVER_PREFIX + " " + serviceServerText;
			String newRuntimeText = SERVICE_RUNTIME_PREFIX + " " + serviceRuntimeText;
			hLinkServiceServer_.setText(newServerText);
			hLinkServiceRuntime_.setText(newRuntimeText);		
			
			/*check to see if text has changed for server or runtime
			if so, repaint links */
			if (!newServerText.equals(currentServerText))
			{
				hLinkServiceServer_.pack(true);
				packSelf();
			}			
			
			if (!newRuntimeText.equals(currentRuntimeText))
			{
				hLinkServiceRuntime_.pack(true);
				packSelf();
			} 
		}				
		labelIds_ = labelIds;
		handleTypeChange();
		
		if (projectDialog_ != null)
			projectDialog_.setTypeRuntimeServer(ids_);
		
		
		//When the server changes, the state of needEar could change.
		//If the the server change results in a change in the state of needEar,
		//update needEar and serviceEarProjectName.
		ValidationUtils vu = new ValidationUtils();
		boolean oldNeedEar = getServiceNeedEAR();
		boolean serviceProjectOrProjectTypeNeedsEar;

		if (!oldNeedEar)
		{
			//If an EAR was not needed previously it could have been because of the project/project type or the server.
			//If it was because of the project/project type, changing the server should have no impact
			//on the state of needEar.
			serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
		}
		else
		{
			serviceProjectOrProjectTypeNeedsEar = true;
		}
		
		//boolean serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
		if (serviceProjectOrProjectTypeNeedsEar)
		{
			//Could not rule out need for an Ear from the project/project type so changing the server
			//may impact the need for an Ear.

			boolean currentServiceServerNeedsEar = vu.serverNeedsEAR(getServiceTypeRuntimeServer().getServerId());
			if (oldNeedEar != currentServiceServerNeedsEar)
			{
				//Update needEar and serviceEarProjectName.
				if (currentServiceServerNeedsEar)
				{
					//Calculate a reasonable default for the Ear project name
					String earProjectName = DefaultingUtils.getDefaultEARProjectName(getServiceProjectName());
					setServiceNeedEAR(currentServiceServerNeedsEar);
					setServiceEarProjectName(earProjectName);
				}
				else
				{
					setServiceNeedEAR(currentServiceServerNeedsEar);
					setServiceEarProjectName("");					
				}
				
			}
		}		
	}

	public TypeRuntimeServer getServiceTypeRuntimeServer() {
		return ids_;
	}

	public void setServiceGeneration(int value)
	{
		serviceScale_.setSelection(value);
		setGraphics(value);
		
		//enable client widget based on service scale setting
		clientWidget_.enableClientSlider(value<=ScenarioContext.WS_START);
		
		/*for popup case need to make sure that the UI is refreshed based on 
		changes to data*/
		packSelf();
	}	

	public int getServiceGeneration()
	{
		return serviceScale_.getSelection();
	}
	
	public boolean getDevelopService() {
		return developService_;
	}

	public void setDevelopService(boolean developService) {
		this.developService_ = developService;
	}	
	
	public boolean getAssembleService() {
		return assembleService_;
	}

	public void setAssembleService(boolean assembleService) {
		this.assembleService_ = assembleService;
	}

	public boolean getDeployService() {
		return deployService_;
	}

	public void setDeployService(boolean deployService) {
		this.deployService_ = deployService;
	}
	
	public Boolean getStartService(){
		return startService_;
	}
	
	public void setStartService(Boolean value) {
        startService_=value;
	}

	public Boolean getInstallService() {
		return installService_;
	}

	public void setInstallService(Boolean value) {
        installService_=value;
	}

	public Boolean getTestService() {
        return 
        new Boolean( testService_.booleanValue() || clientWidget_.getTestClient().booleanValue());
	}

	public void setTestService(Boolean value) {
        testService_= value;
	}
	public Boolean getMonitorService() {
		return new Boolean(monitorButton_.getSelection());
	}

	public void setMonitorService(Boolean value) {
		monitorButton_.setSelection(value.booleanValue());
	}

	public Boolean getPublishService() {		
		return new Boolean(publishButton_.getSelection());
	}

	public void setPublishService(Boolean value) {
		publishButton_.setSelection( value.booleanValue() );
	}

	public Boolean getGenerateProxy() {
		return new Boolean(clientWidget_.getGenerateProxy());		
	}

	public void setClientGeneration(int value)
	{
		clientWidget_.setClientGeneration(value);
		/*for popup case need to make sure that the UI is refreshed based on 
			changes to data*/
		packSelf();
	}
	
	public String getClientEarProjectName()
	{
		return clientWidget_.getClientEarProjectName();
	}
	
	public String getClientProjectName()
	{
		return clientWidget_.getClientProjectName();
	}
	
	public int getClientGeneration()
	{
		return clientWidget_.getClientGeneration();
	}	

	public ResourceContext getResourceContext() {
		if (resourceContext_ == null) {
			resourceContext_ = WebServicePlugin.getInstance()
					.getResourceContext();
		}
		return resourceContext_;
	}

	public void setResourceContext(ResourceContext context) {
		resourceContext_ = context;
	}

	public IStructuredSelection getObjectSelection()
	{
		return objectSelection_;		
	}
	
	public void setObjectSelection(IStructuredSelection selection )
	{
		objectSelection_ = selection;
	}
	
	public WebServicesParser getWebServicesParser()
	{
		return parser_;
	}
	
	public void setWebServicesParser(WebServicesParser parser)
	{
		parser_ = parser;
		clientWidget_.setWebServicesParser(parser);
	}
	
	public void internalize() {		
		
		if (preferencesPage_)
			return;
		
		if (objectSelectionWidget_ == null)
			objectSelectionWidget_ = getSelectionWidget();
		
		String displayable = null;
		
		if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) {		
			IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable) objectSelectionWidget_;
			launchable.setInitialSelection(objectSelection_);
			objectSelection_ = launchable.getObjectSelection();
			displayable = launchable.getObjectSelectionDisplayableString();
		}
		else {
			IObjectSelectionWidget selectionWidget = (IObjectSelectionWidget) objectSelectionWidget_;
			selectionWidget.setInitialSelection(objectSelection_);
		    displayable = selectionWidget.getObjectSelectionDisplayableString();
		}
		
		if (displayable == null || displayable.length() == 0)
			return;
			
		serviceImpl_.removeModifyListener(objectModifyListener_);
		serviceImpl_.setText(displayable);
		serviceImpl_.addModifyListener(objectModifyListener_);
	}

	public IStatus getStatus() {
		IStatus status = Status.OK_STATUS;

		IStatus missingFieldStatus = checkMissingFieldStatus();
		if (missingFieldStatus.getSeverity() == IStatus.ERROR) {
			return missingFieldStatus;
		}

		IStatus serviceImplValidationStatus = checkServiceImplTextStatus();
		if (serviceImplValidationStatus.getSeverity() == IStatus.ERROR) {
			return serviceImplValidationStatus;
		}
		else if (serviceImplValidationStatus.getSeverity() == IStatus.WARNING){
			return serviceImplValidationStatus;
		}

		IStatus possibleErrorStatus = checkErrorStatus();
		if (possibleErrorStatus.getSeverity() == IStatus.ERROR || possibleErrorStatus.getSeverity() == IStatus.WARNING) {
			return possibleErrorStatus;
		}

		IStatus possibleWarningStatus = checkWarningStatus();
		if (possibleWarningStatus.getSeverity() == IStatus.WARNING) {
			return possibleWarningStatus;
		}

		// If no warnings/errors were reported, clear validation state on
		// service side and client side (if enabled)
		validationState_ = ValidationUtils.VALIDATE_NONE;
		if (clientWidget_.getGenerateProxy()) {
			clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE);
		}

		return status;
	}
	
	/*
	 * call validation code in the object selection widget to ensure any
	 * modifications to the serviceImpl_ field are valid
	 */
	private IStatus checkServiceImplTextStatus() {
		
		String fieldText = serviceImpl_.getText().trim();

		if (objectSelectionWidget_ == null)
		{
			objectSelectionWidget_ = getSelectionWidget();
		}
		
		IObjectSelectionLaunchable launchable = null;
		if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
		    {      	
				launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
				validObjectSelection_ = launchable.validate(fieldText);
			}
			else 
			{
				IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
				validObjectSelection_ = widget.validate(fieldText);
			}
		
		if (!validObjectSelection_)
		{
			int scenario = getWebServiceScenario();
			
			if (scenario == WebServiceScenario.BOTTOMUP){
				if (launchable != null){
					IStatus valStatus = launchable.validateSelection(new StructuredSelection(fieldText));
					if (valStatus.getSeverity() == IStatus.WARNING)
						return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION);
				}
				else
					return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_IMPL);
			}
			else
				return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF);			
		}		
		
		return Status.OK_STATUS;
	}

	private int getWebServiceScenario()
	{
		   int index = webserviceType_.getSelectionIndex();	
		   String typeId = labelIds_.getIds_()[index];
		   return WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);		
	}
	
	private IStatus checkMissingFieldStatus() {

		// 1. Check for missing fields on service side
		ValidationUtils valUtils = new ValidationUtils();
		String serviceImpl = serviceImpl_.getText().trim();
		String typeId = getServiceTypeRuntimeServer().getTypeId();
		String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
		String serverId = getServiceTypeRuntimeServer().getServerId();
		String projectName = getServiceProjectName();
		boolean needEar = getServiceNeedEAR();
		String earProjectName = getServiceEarProjectName();
		String projectTypeId = getServiceComponentType();
		
		IStatus serviceMissingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, typeId, serviceImpl,
				runtimeId, serverId, projectName, needEar, earProjectName, projectTypeId, false);
		if (serviceMissingFieldStatus.getSeverity() == IStatus.ERROR) {
			return serviceMissingFieldStatus;
		}

		// 2. Check for missing fields on the client side if it's visible.
		if (clientWidget_.getGenerateProxy()) {
			IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus();
			if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) {
				return clientMissingFieldsStatus;
			}

		}

		return Status.OK_STATUS;
	}

	private IStatus checkErrorStatus() {

		ValidationUtils valUtils = new ValidationUtils();

		// 1. Check for errors on service side
		String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
		String serverId = getServiceTypeRuntimeServer().getServerId();
		String serverInstanceId = getServiceTypeRuntimeServer().getServerInstanceId();
		String typeId = getServiceTypeRuntimeServer().getTypeId();
		String projectName = getServiceProjectName();
		boolean needEar = getServiceNeedEAR();
		String earProjectName = getServiceEarProjectName();
		String projectTypeId = getServiceComponentType();
		String initialProjectName = "";
		if (initialProject_ != null) {
			initialProjectName = initialProject_.getName();
		} 
		IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, typeId, runtimeId, serverId, 
				serverInstanceId, projectName, initialProjectName, needEar, earProjectName, projectTypeId, false);
		if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {
			return serviceSideErrorStatus;
		}

		// 2. Check for errors on client side if it is visible
		if (clientWidget_.getGenerateProxy()) {
			IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus();
			if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) {
				return clientSideErrorStatus;
			}

			// 3. Check for errors that span service and client if client side
			// is visible.
			int clientValidationState = clientWidget_.getValidationState();
			if (validationState_ == ValidationUtils.VALIDATE_ALL
					|| validationState_ == ValidationUtils.VALIDATE_PROJECT_CHANGES
					|| clientValidationState == ValidationUtils.VALIDATE_ALL
					|| clientValidationState == ValidationUtils.VALIDATE_PROJECT_CHANGES) {
				IWebServiceRuntimeChecker runtimeChecker = null;

				String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), projectName, projectTypeId);	    		
				runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);

				if (runtimeChecker != null) {
					return runtimeChecker.checkServiceClientCompatibility(
							getServiceNeedEAR(), getServiceEarProjectName(), getServiceProjectName(), 
							clientWidget_.getClientNeedEAR(), clientWidget_.getClientEarProjectName(), 
							clientWidget_.getClientProjectName());
				}
			}
		}

		return Status.OK_STATUS;
	}

	private IStatus checkWarningStatus() {
		ValidationUtils valUtils = new ValidationUtils();
		// 1. Check for warnings on the service side
		int scaleSetting = getServiceGeneration();
		String serverId = getServiceTypeRuntimeServer().getServerId();
		IStatus serviceWarningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getServiceTypeRuntimeServer().getServerInstanceId(), false);
		if (serviceWarningStatus.getSeverity() == IStatus.WARNING) {
			return serviceWarningStatus;
		}

		// 2. Check for warnings on the client side if it's enabled
		if (clientWidget_.getGenerateProxy()) {
			IStatus clientWarningStatus = clientWidget_.checkWarningStatus();
			if (clientWarningStatus.getSeverity() == IStatus.WARNING) {
				return clientWarningStatus;
			}

		}

		return Status.OK_STATUS;
	}
		
	protected void initImageRegistry()
	{
		imageReg_ = new ImageRegistry(Display.getCurrent());
		
		imageReg_.put(ICON_SCALE_BG_0, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_0));
		imageReg_.put(ICON_SCALE_BG_1, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_1));
		imageReg_.put(ICON_SCALE_BG_2, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_2));
		imageReg_.put(ICON_SCALE_BG_3, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_3));
		imageReg_.put(ICON_SCALE_BG_4, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_4));
		imageReg_.put(ICON_SCALE_BG_5, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_5));
		imageReg_.put(ICON_SCALE_BG_6, WebServiceConsumptionUIPlugin
				.getImageDescriptor(ICON_SCALE_BG_6));
		
		imageReg_.put(GRAPHIC_SERVICE_0, WebServiceCreationUIPlugin
				.getImageDescriptor(GRAPHIC_SERVICE_0));
		imageReg_.put(GRAPHIC_SERVICE_1, WebServiceCreationUIPlugin
				.getImageDescriptor(GRAPHIC_SERVICE_1));
		imageReg_.put(GRAPHIC_SERVICE_2, WebServiceCreationUIPlugin
				.getImageDescriptor(GRAPHIC_SERVICE_2));
		imageReg_.put(GRAPHIC_SERVICE_3, WebServiceCreationUIPlugin
				.getImageDescriptor(GRAPHIC_SERVICE_3));
		imageReg_.put(GRAPHIC_SERVICE_4, WebServiceCreationUIPlugin
				.getImageDescriptor(GRAPHIC_SERVICE_4));
		imageReg_.put(GRAPHIC_SERVICE_5, WebServiceCreationUIPlugin
				.getImageDescriptor(GRAPHIC_SERVICE_5));
	}
	
	private void setAdvancedOptions(boolean enabled)
	{
		monitorButton_.setEnabled(enabled); 
		publishButton_.setEnabled(enabled);		
	}
	
	public void setServiceProjectName(String name)
	  {
		serviceProjectName_= name;
		hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX + " " + serviceProjectName_);
		hLinkServiceProject_.pack(true);
		packSelf();	
	  }
	
	public void setInitialProject(IProject project)
	{
		initialProject_ = project;
	}
	
	 public void setServiceEarProjectName(String name)
	  {	  
		 serviceEarProjectName_ = name;
		 refreshEARLink();
	  }
	 
	  public void refreshEARLink()
	  {
		  hLinkServiceEAR_.setVisible(needEar_); 
		  if (needEar_)
		  {			 
			  hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX + " " + serviceEarProjectName_);
			  hLinkServiceEAR_.pack(true);
			  packSelf();
		  }
	  }
	 public void setServiceComponentType( String type )
	  {
		 serviceComponentType_ = type;
	  }
	 
	  public void setClientProjectName(String name)
	  {
	    clientWidget_.setClientProjectName(name);  
	  }  
	  
	  public void setClientEarProjectName(String name)
	  {
	    clientWidget_.setClientEarProjectName(name);  
	  }
	  
	  IProject project_;
	  
	  public String getServiceComponentType()
	  {
		  return serviceComponentType_;
	  }
	  
	  public void setClientComponentType(String type)
	  {
		  clientWidget_.setClientComponentType(type);
	  }
	  
	  public String getClientComponentType()
	  {
		  return clientWidget_.getClientComponentType();
	  }
	 
	  public String getServiceProjectName()
	  {
		  return serviceProjectName_;
	  }
	  
	  public String getServiceEarProjectName()
	  {
		  return serviceEarProjectName_;
	  }
	  
	  public void setClientProject(IProject project)
	  {
		  clientWidget_.setProject(project);
	  }
	  
	  private IProject getClientProject()
	  {
		  return clientWidget_.getProject(); 
	  }
	  
	  public void setProject(IProject project)
	  {
		  project_ = project;
	  }	  
	  	  
	  public IProject getProject()
	  {
		  return project_;
	  }
	  
	  public String getServiceRuntimeId()
	  {
		  // calculate the most appropriate serviceRuntimeId based on current settings.
		  return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), getServiceProjectName(), getServiceComponentType());    
	  }
	  
	  public String getClientRuntimeId()
	  {
		  return clientWidget_.getClientRuntimeId();
	  }
	  
	  public void setServiceNeedEAR(boolean b)
	  {
		  needEar_ = b;
		  refreshEARLink();
	  }
	  
	  public boolean getServiceNeedEAR()
	  {
		  return needEar_;
	  }
	  
	  public void setClientNeedEAR(boolean b)
	  {
	    clientWidget_.setClientNeedEAR(b);
	  }	  
	  
	  public boolean getClientNeedEAR()
	  {
		  return clientWidget_.getClientNeedEAR();
	  }
	  
	  // looks through extensions and returns the appropriate selection widget
	  private Object getSelectionWidget()
	  {
			String         wst      = getServiceTypeRuntimeServer().getTypeId();
			int            scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
			String         implId   = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
		  WebServiceImpl wsimpl   = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
      Object         result   = null;
        
		    
		  if (wsimpl != null)
		  {
		    String objectSelectionWidgetId = null;
		    if (scenario == WebServiceScenario.TOPDOWN)
		    {
		      objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
		    }
		    else
		    {
		      objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
		    }
        
        ObjectSelectionRegistry registry = ObjectSelectionRegistry.getInstance();
        boolean editable = registry.getExternalModify( objectSelectionWidgetId );
                
        serviceImpl_.setEditable( editable );
        result = registry.getSelectionWidget( objectSelectionWidgetId );
      }
      
		  return result;
	  }
	 
	// for the purposes of disabling the service implementation controls from the preferences dialog
	public void disableNonPreferenceWidgets()
	{
		if (serviceImpl_ != null)
			serviceImpl_.setEnabled(false);
		if (browseButton_ != null)
			browseButton_.setEnabled(false);
		if (hCompService_ != null)
		{
			hCompService_.setVisible(false);			
		}
		clientWidget_.disableNonPreferenceWidgets();
	}
	
	private void setGraphics(int value)
	{
		String iconImage = "";
		String toplogyImage = "";
		switch (value) {
		case 0:
			iconImage=ICON_SCALE_BG_0;
			toplogyImage=GRAPHIC_SERVICE_0;
			break;
		case 1:
			iconImage=ICON_SCALE_BG_1;
			toplogyImage=GRAPHIC_SERVICE_1;
			break;
		case 2:
			iconImage=ICON_SCALE_BG_2;
			toplogyImage=GRAPHIC_SERVICE_2;
			break;
		case 3:
			iconImage=ICON_SCALE_BG_3;
			toplogyImage=GRAPHIC_SERVICE_3;
			break;
		case 4:
			iconImage=ICON_SCALE_BG_4;
			toplogyImage=GRAPHIC_SERVICE_4;
			break;
		case 5:					
		case 6:
			iconImage=ICON_SCALE_BG_5;
			toplogyImage=GRAPHIC_SERVICE_5;
			break;
		default:
			break;
		}
		serviceScale_.setBackgroundImage(imageReg_.get(iconImage));
		topologySpot_.setImage(imageReg_.get(toplogyImage));
	}
	
	private void refreshServerRuntimeSelection()
	{		
		//new up ServerRuntimeSelectionWidgetDefaultingCommand
		ServerRuntimeSelectionWidgetDefaultingCommand serverRTDefaultCmd = new ServerRuntimeSelectionWidgetDefaultingCommand();
		
		  //call setters of new defaulting command:
	      serverRTDefaultCmd.setInitialSelection(getObjectSelection());
	      serverRTDefaultCmd.setInitialProject(getProject());
	      serverRTDefaultCmd.setGenerateProxy(clientWidget_.getGenerateProxy());
	      serverRTDefaultCmd.setServiceTypeRuntimeServer(getServiceTypeRuntimeServer());
		  serverRTDefaultCmd.setWebServicesParser(getWebServicesParser());     
		  serverRTDefaultCmd.setClientInitialSelection(getObjectSelection());
	      serverRTDefaultCmd.setClientInitialProject(getClientProject());
	      serverRTDefaultCmd.setClientEarProjectName(clientWidget_.getClientEarProjectName());
		  serverRTDefaultCmd.setClientTypeRuntimeServer(getClientTypeRuntimeServer());
		  		  
		  serverRTDefaultCmd.execute(null, null);
		  
		  //perform mappings from the defaulting command to the project settings...	
		  setServiceProjectName(serverRTDefaultCmd.getServiceProjectName());
		  setServiceEarProjectName(serverRTDefaultCmd.getServiceEarProjectName());
		  setServiceComponentType(serverRTDefaultCmd.getServiceComponentType());
		  setClientProjectName(serverRTDefaultCmd.getClientProjectName());
		  setClientEarProjectName(serverRTDefaultCmd.getClientEarProjectName());
		  setServiceTypeRuntimeServer(serverRTDefaultCmd.getServiceTypeRuntimeServer());
          setClientTypeRuntimeServer(serverRTDefaultCmd.getClientTypeRuntimeServer());
          setServiceNeedEAR(serverRTDefaultCmd.getServiceNeedEAR());
          setClientNeedEAR(serverRTDefaultCmd.getClientNeedEAR());
          setClientComponentType(serverRTDefaultCmd.getClientComponentType());
	}
	
	/**
	 *  Update client server and runtime based on service side
	 */
	private void refreshClientServerRuntimeSelection()
	{	
		TypeRuntimeServer clientTypeRuntimeserver = getClientTypeRuntimeServer();
		clientTypeRuntimeserver.setRuntimeId(getServiceTypeRuntimeServer().getRuntimeId());
		clientTypeRuntimeserver.setServerId(getServiceTypeRuntimeServer().getServerId());
		clientTypeRuntimeserver.setServerInstanceId(getServiceTypeRuntimeServer().getServerInstanceId());
		setClientTypeRuntimeServer(clientTypeRuntimeserver);
	}	
		
	
	private void callObjectTransformation(IStructuredSelection objectSelection,
			IProject project, String componentName, boolean refreshRuntime)
	{
		ObjectSelectionOutputCommand objOutputCommand = new ObjectSelectionOutputCommand();
		   objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer());
		   objOutputCommand.setObjectSelection(objectSelection);
	       objOutputCommand.setProject(project);
	       objOutputCommand.setComponentName(componentName);			   
	       
	       objOutputCommand.execute(null, null);
        
	       setWebServicesParser(objOutputCommand.getWebServicesParser());
	       setObjectSelection(objOutputCommand.getObjectSelection());
	       setProject(objOutputCommand.getProject());      		       
	       
	       if (refreshRuntime || forceRefreshRuntime)
	    	   refreshServerRuntimeSelection();  
	       
	       forceRefreshRuntime = false;
	}
	
	private class ScaleSelectionListener implements SelectionListener
	{
		public void widgetSelected(SelectionEvent e) {			
			    
			    Scale scale = (Scale)e.widget;
				int selection = scale.getSelection();
				
				//TODO: change the hard coded integers here to the the ScenarioContext.WS_xxx when in less critical phase
				switch (selection) {
				case 0:
					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST);
					break;
				case 1:
					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN);
					break;
				case 2:
					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL);
					break;
				case 3:
					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY);
					break;
				case 4:
					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE);
					break;
				case 5:					
				case 6:
					serviceScale_.setSelection(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop service @ minimum
					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
					//reset local selection so that setters get correct value below
					selection = ScenarioContext.WS_DEVELOP;
					break;
				default:
					break;
				}
				
				setDevelopService(selection <= ScenarioContext.WS_DEVELOP);
				setAssembleService(selection <= ScenarioContext.WS_ASSEMBLE);
				setDeployService(selection <= ScenarioContext.WS_DEPLOY);
				
				setTestService(new Boolean(selection <= ScenarioContext.WS_TEST));
				setInstallService(new Boolean(selection <= ScenarioContext.WS_INSTALL));
				setStartService(new Boolean(selection <= ScenarioContext.WS_START));
				setAdvancedOptions(selection <= ScenarioContext.WS_INSTALL);
				clientWidget_.enableClientSlider(selection <= ScenarioContext.WS_START);
				
				setGraphics(selection);
				
				//Validate the page
				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES);
				statusListener_.handleEvent(null);
				
			}		

		public void widgetDefaultSelected(SelectionEvent e) {
			widgetSelected(e);
		}
	}
	
	private class ServiceImplBrowseListener implements SelectionListener
	{
		public void widgetDefaultSelected(SelectionEvent e) {
			// TODO Auto-generated method stub			
		}
		
		public void widgetSelected(SelectionEvent e) {     
			   
			  if (objectSelectionWidget_ == null)
				   objectSelectionWidget_ = getSelectionWidget();
			  
			   IStructuredSelection objectSelection = null;
			   IProject project = null;
			   String componentName="";
			   int result=Dialog.CANCEL;
			   
			   if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
		       {      	
				 IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_);
				 launchable.setInitialSelection(getObjectSelection());
				 IWorkbench workbench = PlatformUI.getWorkbench();
		         result = launchable.launch(workbench.getActiveWorkbenchWindow().getShell());
		         if (result == Dialog.OK)
		         {
		        	 serviceImpl_.removeModifyListener(objectModifyListener_);
			         serviceImpl_.setText(launchable.getObjectSelectionDisplayableString());
			         serviceImpl_.addModifyListener(objectModifyListener_);
			         objectSelection = launchable.getObjectSelection();
			         project = launchable.getProject();
			         componentName= launchable.getComponentName();
		         }
		       }
			   else
			   {
				   browseDialog_.setTypeRuntimeServer(getServiceTypeRuntimeServer());
				   browseDialog_.setInitialSelection(getObjectSelection());
			       result = browseDialog_.open();
			       if (result == Dialog.OK)
			       {
			    	   serviceImpl_.removeModifyListener(objectModifyListener_);
				       serviceImpl_.setText(browseDialog_.getDisplayableSelectionString()); 
				       serviceImpl_.addModifyListener(objectModifyListener_);
				       objectSelection = browseDialog_.getObjectSelection();
				       project = browseDialog_.getProject();
				       componentName= browseDialog_.getComponentName();			       
			       }
			   }
			   
			   // call ObjectSelectionOutputCommand to carry out any transformation on the objectSelection
			   if (result == Dialog.OK)
			   {
				   callObjectTransformation(objectSelection, project, componentName, getWebServiceScenario() != WebServiceScenario.TOPDOWN);				   
			       validationState_ = ValidationUtils.VALIDATE_ALL;
			       statusListener_.handleEvent(null); // validate the page
			   }			   
	    }
	}

	
}

Back to the top

eediting.tests.git/diff/tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd?h=v200602081600'>tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/sl.dtd33
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-deprecated-1.mod103
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-framework-1.mod71
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-qname-1.mod80
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml-special-1.mod248
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-flat.dtd3609
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20-model-1.mod184
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd154
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/wta-wml12.dtd21
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-flat.dtd3216
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10-model-1.mod160
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wapDTDs/WAP-2-0/xhtml-mobile10.dtd189
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/DTDs/wml20_dtd160
-rw-r--r--tests/org.eclipse.jst.jsp.ui.tests/testfiles/XHTML/xhtml1-transitional.dtd1196
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.project28
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF21
-rw-r--r--tests/org.eclipse.wst.css.core.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.css.core.tests/build.properties20
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java56
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java129
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java31
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java68
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java173
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/BUG73990SelectorFormatTest.java28
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java48
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java265
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java94
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java42
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java215
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java218
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java74
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java185
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java817
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java217
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java105
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java261
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/BUG73990_selector_unformatted.css35
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css29
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css17
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css42
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/BUG73990_selector_formatted.css79
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css30
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css41
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css102
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css554
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css554
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css68
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css454
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css29
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css73
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css124
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css706
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css706
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css101
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css583
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css8
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css11
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css20
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css54
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css54
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css10
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css82
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java104
-rw-r--r--tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java69
-rw-r--r--tests/org.eclipse.wst.css.core.tests/test.xml87
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.classpath7
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.project28
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs66
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF18
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/about.html22
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/build.properties11
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java56
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java142
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java171
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java143
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java30
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java54
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/test.xml89
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css0
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css46
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css5
-rw-r--r--tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css7
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.cvsignore8
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF24
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/build.properties8
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java19
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java54
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java20
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java47
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java231
-rw-r--r--tests/org.eclipse.wst.css.ui.tests/test.xml47
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.cvsignore6
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF26
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/build.properties8
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java104
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java32
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java39
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java32
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java76
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java144
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java149
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java445
-rw-r--r--tests/org.eclipse.wst.dtd.ui.tests/test.xml87
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.classpath7
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.project28
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs58
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF19
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/about.html22
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/build.properties9
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java56
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java142
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java167
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java253
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java54
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/test.xml89
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html0
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html664
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html665
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html18
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html19
-rw-r--r--tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html20
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.project28
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF25
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/build.properties18
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.html.ui.tests/plugin.xml15
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java114
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java34
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java68
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java47
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java32
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java238
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java447
-rw-r--r--tests/org.eclipse.wst.html.ui.tests/test.xml87
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.project27
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF21
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/build.properties18
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java14
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java67
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java77
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java55
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java113
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java47
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java47
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java47
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java194
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java93
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java57
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java69
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java57
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java55
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java38
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java49
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java51
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java45
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java42
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java31
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java70
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java187
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java191
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java86
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java90
-rw-r--r--tests/org.eclipse.wst.sse.core.tests/test.xml87
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.project27
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF23
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/build.properties17
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/plugin.xml79
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java172
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java99
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java809
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java154
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java66
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java34
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java88
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java27
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java68
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java186
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java66
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java270
-rw-r--r--tests/org.eclipse.wst.sse.ui.tests/test.xml87
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.project27
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF17
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/build.properties12
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd30
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml41
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd25
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml41
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd79
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml19
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd65
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml32
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd77
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd68
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml30
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd59
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd59
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml28
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd81
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml28
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd81
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd196
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml9
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml8
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml11
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml42
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml13
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml8
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml6
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd4
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml4
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml3
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd6
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml15
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml15
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml13
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml4
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml9
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml6
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl27
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml10
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml7
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff2
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result1
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd390
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/plugin.xml29
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java132
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java23
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java133
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java140
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java74
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java57
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java99
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java84
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/XSDSchemaTest.java17
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/FileUtil.java93
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ResolvingXMLParser.java111
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/TraXLiaison.java281
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ValidatorTest.java51
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTLiaison.java105
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTWithCatalogResolverTest.java97
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/MyXMLCatalogResolver.java50
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/Validator.java160
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/ValidatorTest.java148
-rw-r--r--tests/org.eclipse.wst.xml.catalog.tests/test.xml59
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.project27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/build.properties20
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/plugin.xml20
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zipbin1257 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java145
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java52
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java79
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java130
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java325
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java149
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java102
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java107
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java176
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java331
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java105
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java373
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java114
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java78
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java136
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java59
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestFragFile.java61
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelManager.java265
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestModelsFromFiles.java148
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java324
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestXMLModelLoader.java129
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/NullStream.java27
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/TestStructuredPartitionerXML.java355
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/company300k.xml8100
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/empty.xml0
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/example01.xml4
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/text/testfiles/xml/testcase.dtd59
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/CommonXML.java88
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/DateUtil.java46
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/FileUtil.java165
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/ProjectUnzipUtility.java374
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/util/TimestampUtil.java51
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/test.xml51
-rw-r--r--tests/org.eclipse.wst.xml.core.tests/testfiles.zipbin64336 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.classpath7
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.project27
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/.settings/org.eclipse.pde.prefs14
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/LargeNoEncoding.html0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/LargeNonDefault.html0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/META-INF/MANIFEST.MF25
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/about.html22
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/build.properties25
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/IBM14_0128.txt857
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/outputFromListCharsets/Sun1.4.3_02.txt343
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/CreateCodedReaderTester.java253
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/EncodingTestSuite.java67
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/FileUtil.java55
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateFiles.java30
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/GenerateXMLFiles.java409
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/ListCharsets.java84
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/TestsPlugin.java149
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/pref/TestPreferences.java109
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestCommonNames.java73
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestDisplayNames.java28
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/properties/TestOverrides.java44
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReader.java614
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestCodedReaderOnGennedFiles.java717
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentDescription.java520
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDescriptionOnGennedFiles.java711
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetection.java210
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypeDetectionForXML.java187
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/read/TestContentTypes.java50
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/ProjectUnzipUtility.java337
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/util/WorkspaceProgressMonitor.java54
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/write/TestCodedWrite.java127
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLEncodingTests.java172
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLHeadTokenizerTester.java360
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/src/org/eclipse/wst/xml/tests/encoding/xml/XMLMalformedInputTests.java273
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/test.xml89
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles.zipbin124976 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.htm40
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/DocumentStreamTestCase/kaeru5.jsp40
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/emptyFile.css0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_eucjp.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_jis.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/encoding_test_sjis.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/noEncoding.css46
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandard.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed.css5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/css/nonStandardIllFormed2.css7
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-Big5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-CESU-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-COMPOUND_TEXT.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-EUC-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-EUC-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-EUC-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-GB18030.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-GB2312.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-GBK.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1006.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1041.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1043.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1046.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1046S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1088.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1098.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1114.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1115.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1124.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1363.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1363C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1370.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1381.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1383.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-1386.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-33722C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-437.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-737.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-775.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-808.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-850.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-852.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-855.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-856.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-857.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-858.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-859.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-860.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-861.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-862.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-863.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-864.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-864S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-865.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-866.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-867.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-868.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-869.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-874.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-897.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-921.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-922.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-932.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-942.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-942C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-943.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-943C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-948.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-949C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-IBM-954C.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-CN-GB.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-2022-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-1.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-10.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-13.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-14.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-15.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-16.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-3.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-4.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-6.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-6S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-7.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-ISO-8859-9.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-JIS0201.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-JIS0208.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-JIS0212.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-Johab.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KOI8-R.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KOI8-RU.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KOI8-U.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-KSC5601.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacArabic.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacCentralEurope.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacCroatian.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacCyrillic.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacGreek.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacHebrew.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacIceland.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacRoman.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacRomania.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacThai.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacTurkish.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-MacUkraine.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-PTCP154.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-Shift_JIS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-TIS-620.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-US-ASCII.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-16.xmlbin212 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-16BE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-16LE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-32.xmlbin424 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-32BE.xmlbin432 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-32LE.xmlbin432 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-UTF-8J.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-X-UnicodeBig.xmlbin224 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-X-UnicodeLittle.xmlbin230 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-hp-roman8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1250.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1251.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1252.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1253.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1254.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1255.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1256.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1256S.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1257.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-1258.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-874.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-932.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-936.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/test-windows-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2 (1.4.2)/xml/testMethods.text525
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-Big5-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-Big5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-EUC-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-EUC-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-GB18030.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-GBK.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-2022-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-2022-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-1.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-13.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-15.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-3.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-4.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-6.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-7.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-ISO-8859-9.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-JIS_X0201.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-JIS_X0212-1990.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-KOI8-R.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-Shift_JIS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-TIS-620.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-US-ASCII.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-16.xmlbin212 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-16BE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-16LE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-UTF-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1250.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1251.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1252.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1253.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1254.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1255.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1256.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1257.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-1258.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-windows-31j.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-EUC-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-EUC-TW.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-JIS0208.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-Johab.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-MS950-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-euc-jp-linux.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-mswin-936.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-windows-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/test-x-windows-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_03 (1.4.2_03-b02)/xml/testMethods.text193
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-Big5-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-Big5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-EUC-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-EUC-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-GB18030.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-GBK.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-2022-JP.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-2022-KR.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-1.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-13.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-15.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-3.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-4.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-5.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-6.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-7.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-ISO-8859-9.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-JIS_X0201.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-JIS_X0212-1990.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-KOI8-R.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-Shift_JIS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-TIS-620.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-US-ASCII.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-16.xmlbin212 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-16BE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-16LE.xmlbin216 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-UTF-8.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1250.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1251.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1252.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1253.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1254.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1255.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1256.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1257.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-1258.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-windows-31j.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-EUC-CN.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-EUC-TW.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-JIS0208.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-Johab.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-MS950-HKSCS.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-euc-jp-linux.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-mswin-936.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-windows-949.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/test-x-windows-950.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/genedFiles-1.4.2_05 (1.4.2_05-b04)/xml/testMethods.text193
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/EmptyFile.html0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/IllformedNormalNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNoEncoding.html664
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/LargeNonDefault.html665
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/MultiNonDefault.html20
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NoEncoding.html18
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/NormalNonDefault.html19
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/html/noquotes.html20
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/EmptyFile.jsp0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp8
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefault.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp122
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp17
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/javaEncodingValue.jsp17
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/noEncoding.jsp17
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testBrokenLine.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp18
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp21
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraJunk.jsp5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testIllFormed2.jsp3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirective.jsp4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp8
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp356
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testNormalCase.jsp1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjspbin78 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/testUTF16.jspbin118 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jspbin990 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jspbin522 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jspbin478 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp122
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp121
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp19
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/regressionTestFiles/defect229667/audi.jsp194
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/EmptyFile.xml0
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/IllformedNormalNonDefault.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xml5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/MalformedNoEncoding.xsl8
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NoEncoding.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/NormalNonDefault.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF16LEAtStartOfLargeFile.xmlbin35914 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/UTF8With3ByteBOM.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/eucjp.xml13
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/shiftjis.xml13
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraJunk.xml5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testExtraValidStuff.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed3.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testIllFormed4.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testMultiLine.xml5
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoEncodingValue.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDecl.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclAtFirst.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNoXMLDeclInLargeFile.xml356
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testNormalCase.xml1
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testUTF16.xmlbin118 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl2.xml3
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/testWSBeforeXMLDecl3.xml4
-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xmlbin990 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xmlbin522 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.tests.encoding/testfiles/xml/utf16WithJapaneseChars.xmlbin466 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.project27
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/META-INF/MANIFEST.MF26
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/build.properties19
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/icons/brkp_obj.gifbin197 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/icons/sourceEditor.gifbin353 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/plugin.properties11
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/plugin.xml42
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/basicXHTML.jpgbin37408 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/conv2XHTML.jpgbin42622 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/identifyDTD.jpgbin15318 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/importDTD.jpgbin38739 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/outline1.jpgbin15778 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/outline2.jpgbin10692 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/setupFiles/Wireless.xml10
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/strictXHTML.jpgbin29241 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_files/JobDescERROR.xml0
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_after_paste.jpgbin58872 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/EJBTasks_before_paste.jpgbin35336 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/invalid_dtd.jpgbin33482 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_multi_error.jpgbin28667 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/schema_unknown_element.jpgbin14889 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/w_doctype.jpgbin26186 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wout_doctype.jpgbin19083 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/temperror_smoketest_images/wrong_dtd.jpgbin41573 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/u011ani.gifbin3067 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/smoke/wireless.jpgbin17803 -> 0 bytes-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/Logger.java144
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestEditorConfigurationXML.java47
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestOpenEditorXML.java117
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/TestPropertySheetConfiguration.java161
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/VerifyEditorPlugin.java31
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUIPreferencesTest.java115
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestSuite.java35
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLUITestsPlugin.java68
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/BreakpointErrorProvider.java61
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/breakpoints/EnableWarningAction.java111
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/TestViewerConfigurationXML.java242
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/viewer/ViewerTestXML.java447
-rw-r--r--tests/org.eclipse.wst.xml.ui.tests/test.xml85
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/META-INF/MANIFEST.MF16
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/build.properties11
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/AllXMLTests.java41
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BaseTestCase.java84
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/BugFixesTest.java138
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/PathsTest.java616
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLExamplesTest.java136
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/src/org/eclipse/wst/xml/validation/tests/internal/XMLValidatorTestsPlugin.java42
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/test.xml96
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xml2
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.dtd30
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/Invoice/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceInvalid/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/Invoice.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/InvoiceRemote/InvoiceIndirect.xml24
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xml19
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogue/Catalogue.xsd50
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/PublicationCatalogueInvalid/Catalogue.xml19
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/XMLExamples/j2ee/web.xml13
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidHost.xml3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/CannotLocateDTD/InvalidLocation.xml3
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/EmptyFile/Empty.xml0
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/NotWellFormed/NotWellFormed.xml4
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/RootNoNSChildNS/RootNoNSChildNS.xml5
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDInvalid.xml6
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/ValidateWithDTDValid.xml8
-rw-r--r--tests/org.eclipse.wst.xml.validation.tests/testresources/samples/bugfixes/ValidateWithDTD/simple.dtd7
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.classpath7
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.project28
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.jdt.core.prefs48
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/.settings/org.eclipse.pde.prefs12
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF17
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/about.html22
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/build.properties15
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/AllXSDTests.java37
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BaseTestCase.java315
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java162
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/PathsTest.java1086
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/XSDValidationTestsPlugin.java65
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/test.xml96
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/.cvsignore1
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/EmptyFile/Empty.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log8
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportWithIncorrectSlash/A.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/AngleHatInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/DashInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Dash-InPath/ImportDashInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/Dash-InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/DashInFilename/ImportDash-InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ExclamationInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/ImportPeriodInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Period.InPath/PeriodInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/PeriodInFilename/Period.InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/ImportQuoteInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Quote'InPath/QuoteInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/QuoteInFilename/Quote'InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/ImportSpaceInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Space InPath/SpaceInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/SpaceInFilename/Space InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Copy of -forXerces2.6.2- ImportTilde~InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/TildeInFilename/Tilde~InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/ImportTildeInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Tilde~InPath/TildeInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd-log6
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/Paths/Underscore_InPath/UnderscoreInPathValid.xsd-log5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/EmptyFile/Empty.xsd0
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/A.xsd5
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/B.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportWithIncorrectSlash/C.xsd8
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/ImportXSDWithXSDImportInDiffDir.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/importing.xsd7
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/ImportXSDWithXSDImportInDiffDir/subdir/simple.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/InvalidSchemaInXMLCatalog/InvalidSchemaInXMLCatalog.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/MissingClosingSchemaTag/MissingClosingSchemaTag.xsd2
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/BugFixes/TwoOpenBrackets/TwoOpenBrackets.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/AngleHat^InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHatInFilename/ImportAngleHat^InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/AngleHatInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/AngleHat^InPath/ImportAngleHatInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/CloseBracketInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/ImportCloseBracketInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracket)InPath/ImportCloseBracketInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/CloseBracket)InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/CloseBracketInFilename/ImportCloseBracket)InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/DashInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Dash-InPath/ImportDashInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/Dash-InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/DashInFilename/ImportDash-InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ExclamationInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ImportExclamationInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Exclamation!InPath/ImportExclamationInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/Exclamation!InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation!InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/ExclamationInFilename/ImportExclamation!InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/ImportOpenBracketInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/ImportOpenBracketInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracket(InPath/OpenBracketInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/ImportOpenBracket(InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/OpenBracketInFilename/OpenBracket(InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/ImportPeriodInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Period.InPath/PeriodInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/ImportPeriod.InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/PeriodInFilename/Period.InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/ImportQuoteInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/ImportQuoteInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Quote'InPath/QuoteInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote'InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/ImportQuote'InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/QuoteInFilename/Quote'InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/ImportSpaceInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Space InPath/SpaceInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/ImportSpace InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/SpaceInFilename/Space InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/ImportTilde~InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/TildeInFilename/Tilde~InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/ImportTildeInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Tilde~InPath/TildeInPathValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/ImportUnderscore_InFilenameValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/UnderscoreInFilename/Underscore_InFilenameValid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathInvalid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/ImportUnderscoreInPathValid.xsd4
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathInvalid.xsd3
-rw-r--r--tests/org.eclipse.wst.xsd.validation.tests/testresources/samples/Paths/Underscore_InPath/UnderscoreInPathValid.xsd3
1248 files changed, 0 insertions, 92671 deletions
diff --git a/features/org.eclipse.wst.web_tests.feature/.cvsignore b/features/org.eclipse.wst.web_tests.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/features/org.eclipse.wst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.web_tests.feature/.project b/features/org.eclipse.wst.web_tests.feature/.project
deleted file mode 100644
index 8d3270d0a..000000000
--- a/features/org.eclipse.wst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_tests.feature/build.properties b/features/org.eclipse.wst.web_tests.feature/build.properties
deleted file mode 100644
index 72bbb6d0e..000000000
--- a/features/org.eclipse.wst.web_tests.feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html
-src.includes = license.html,\
- feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_tests.feature/epl-v10.html b/features/org.eclipse.wst.web_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.web_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index 2e4f3a5f6..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.web_tests.feature"
- label="org.eclipse.wst.web_tests.feature"
- version="1.0.0">
-
- <description>
- %description
- </description>
-
-
-
- <license url="license.html">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.test"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.css.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.css.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.html.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_tests.feature/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0ea..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287f0..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 72bbb6d0e..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- license.html
-src.includes = license.html,\
- feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html b/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index f271ab0bd..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.xml_tests.feature"
- label="WTP XML Tests"
- version="1.0.1.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <requires>
- <import feature="org.eclipse.wst.xml_ui.feature"/>
- <import feature="org.eclipse.test" />
- </requires>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.dtd.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.sse.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.ui.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xml.validation.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.xsd.tests.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also available at <A
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore b/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
deleted file mode 100644
index f35525c09..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350fb8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a7b18c5eb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:46:32 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index c4e09efa6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri May 27 23:39:03 EDT 2005
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b2d68ec01..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JSP Core Tests
-Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests
-Bundle-Version: 1.0.0
-Bundle-ClassPath: jspcoretests.jar
-Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.core.tests,
- org.eclipse.jst.jsp.core.tests.cleanupformat,
- org.eclipse.jst.jsp.core.tests.cleanupformat.testfiles,
- org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific,
- org.eclipse.jst.jsp.core.tests.dom
-Require-Bundle: org.junit,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.css.core
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.jsp.core.tests/about.html b/tests/org.eclipse.jst.jsp.core.tests/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index 7011bc69c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- test.xml,\
- jspcoretests.jar,\
- META-INF/,\
- about.html,\
- testfiles/
-jars.compile.order = jspcoretests.jar
-source.jspcoretests.jar = src/
-output.jspcoretests.jar = bin/
-src.includes = test.xml,\
- plugin.xml,\
- META-INF/,\
- testfiles/
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
deleted file mode 100644
index f69e65920..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-import org.eclipse.jst.jsp.core.tests.model.TestModelRelease;
-import org.eclipse.jst.jsp.core.tests.model.TestModelWithNoFile;
-import org.eclipse.jst.jsp.core.tests.taglibindex.TestIndex;
-
-
-
-public class JSPCoreTestSuite extends TestSuite {
- public static Test suite() {
- return new JSPCoreTestSuite();
- }
-
- public JSPCoreTestSuite() {
- super("SSEModelTestSuiteForJSP");
-
- addTest(TestCeanupFormat.suite());
- addTest(ModelCloneSuite.suite());
- addTest(new TestSuite(TestModelHandlers.class, "TestModelHandlers"));
- addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
- addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- addTest(new TestSuite(TestModelRelease.class, "JSP Model Tests"));
- addTest(new TestSuite(TestModelWithNoFile.class, "JSP Model Tests"));
- addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests"));
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index 7f38eaea8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCoreTestsPlugin extends Plugin {
- //The shared instance.
- private static JSPCoreTestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public JSPCoreTestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.core.tests.TestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPCoreTestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPCoreTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = Platform.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
deleted file mode 100644
index 1343e3d07..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static Plugin fPlugin = JSPCoreTestsPlugin.getDefault();
- private static Bundle fBundle = fPlugin.getBundle();
- private static final String fPluginId = fBundle.getSymbolicName();
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, fPluginId, severity, message, exception);
- fPlugin.getLog().log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, fPluginId, IStatus.OK, message, exception);
- fPlugin.getLog().log(statusObj);
- }
- }
-
- /**
- * @return true if the plugin for this logger is debugging
- */
- public static boolean isDebugging() {
- return fPlugin.isDebugging();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(fPluginId + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
deleted file mode 100644
index bbf2cb1e9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ModelCloneSuite extends TestSuite {
- public static Test suite() {
- return new ModelCloneSuite();
- }
-
- public ModelCloneSuite() {
- super("ModelCloneSuite");
-
- addTest(new TestSuite(TestStructuredDocumentClone.class, "TestStructuredDocumentClone"));
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
deleted file mode 100644
index debfacf52..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-class NullInputStream extends InputStream {
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#mark(int)
- */
- public synchronized void mark(int readlimit) {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#markSupported()
- */
- public boolean markSupported() {
- // we can mark nothing.
- // and, we are using this Null class specifically for
- // a "fake" resettable stream.
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
-
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#reset()
- */
- public synchronized void reset() throws IOException {
- // nothing to do
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.io.InputStream#skip(long)
- */
- public long skip(long n) throws IOException {
- return 0;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
deleted file mode 100644
index a6e671f3d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.CleanupTester;
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-
-
-public class TestCeanupFormat extends TestSuite {
- public static Test suite() {
- return new TestCeanupFormat();
- }
-
- public TestCeanupFormat() {
- super("TestCeanupFormat");
-
- addTest(new TestSuite(CleanupTester.class, "CleanupTester"));
- addTest(new TestSuite(FormatTester.class, "FormatTester"));
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
deleted file mode 100644
index d1f8e03be..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- *
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
- /**
- * Constructor for TestModelManager.
- *
- * @param name
- */
- public TestModelManager(String name) {
- super(name);
- }
-
- public void testModelManager() throws IOException {
- IStructuredModel model = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- assertTrue("modelManager must not be null", modelManager != null);
-
- try {
- model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
- assertTrue("basic XML empty model could not be created", model != null);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
-
- }
-
- public void testNullArgument() throws UnsupportedEncodingException, IOException {
- IStructuredModel model = null;
- Exception e = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- try {
- model = modelManager.getModelForEdit((String) null, null, null);
- } catch (IllegalArgumentException exception) {
- e = exception;
- assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
deleted file mode 100644
index 62f7d0592..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestStructuredDocumentClone extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestStructuredDocumentClone(String name) {
- super(name);
- }
-
- public static Test getTest() {
- return new TestStructuredDocumentClone("testCloneStructuredModelJSPXML");
- }
-
- public void testCloneStructuredDocumentXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of XML structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSP structuredDocument is not correct", passed);
-
- }
-
- /**
- * This test is most useful to check breakpoints and dig deep in object
- * to check clones values
- */
- public void testCloneStructuredDocumentJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- String testContent = "<@! page contentType=\"text/xml\" @>";
- IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", testContent, null);
- assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
- IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
- passed = false;
- if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
- passed = false;
- if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
- passed = false;
- assertTrue("newInstance of JSPXML structuredDocument is not correct", passed);
-
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
deleted file mode 100644
index 4fb7adb9e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-
-public class CleanupTester extends TestCase {
- protected IModelManager fModelManager = null;
- protected CleanupProcessorXML fCleanupProcessor = null;
- protected HTMLCleanupProcessorImpl fHTMLCleanupProcessor = null;
-
- public CleanupTester(String name) {
- super(name);
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get cleanup processor
- fCleanupProcessor = new CleanupProcessorXML();
-
- // get HTML cleanup processor
- fHTMLCleanupProcessor = new HTMLCleanupProcessorImpl();
- }
-
- public void testCleanupInsertTagsQuoteAttrs() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // use for debugging
-// String precleaned = structuredModel.getStructuredDocument().get();
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTagsQuoteAttrs.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupInsertTags() throws IOException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("invoice.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "invoice.afterCleanupInsertTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupCompressEmptyElementTags() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setCompressEmptyElementTags(true);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(false);
- cleanupPreferences.setQuoteAttrValues(false);
- cleanupPreferences.setFormatSource(true);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
- fCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterCompressEmptyElementTags.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTML() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testCleanupHTMLtwice() throws UnsupportedEncodingException, IOException {
- // get model
- IStructuredModel structuredModel = getModel("cleanup.afterCleanup.html");
-
- // init CleanupPreferences
- IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
- cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
- cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
- cleanupPreferences.setCompressEmptyElementTags(false);
- cleanupPreferences.setInsertRequiredAttrs(false);
- cleanupPreferences.setInsertMissingTags(true);
- cleanupPreferences.setQuoteAttrValues(true);
- cleanupPreferences.setFormatSource(false);
- cleanupPreferences.setConvertEOLCodes(false);
-
- // cleanup
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
- fHTMLCleanupProcessor.cleanupModel(structuredModel);
- ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
- // compare
- String cleaned = structuredModel.getStructuredDocument().get();
- String expectedFileName = "cleanup.afterCleanup.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, cleaned);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
-// public void testCleanupJSPEmptyTags1() throws UnsupportedEncodingException, IOException {
-// // get model
-// IStructuredModel structuredModel = getModel("login.jsp");
-//
-// // init CleanupPreferences
-// IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-// cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-// cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-// cleanupPreferences.setCompressEmptyElementTags(false);
-// cleanupPreferences.setInsertRequiredAttrs(false);
-// cleanupPreferences.setInsertMissingTags(true);
-// cleanupPreferences.setQuoteAttrValues(true);
-// cleanupPreferences.setFormatSource(true);
-// cleanupPreferences.setConvertEOLCodes(false);
-//
-// // cleanup
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-// fHTMLCleanupProcessor.cleanupModel(structuredModel);
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-// // compare
-// String cleaned = structuredModel.getStructuredDocument().get();
-// String expectedFileName = "login.afterCleanup.jsp";
-// String expected = getFile(expectedFileName);
-// compare(expectedFileName, expected, cleaned);
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
-//
-// public void testCleanupJSPEmptyTags2() throws UnsupportedEncodingException, IOException {
-// // get model
-// IStructuredModel structuredModel = getModel("subscription.jsp");
-//
-// // init CleanupPreferences
-// IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-// cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-// cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-// cleanupPreferences.setCompressEmptyElementTags(false);
-// cleanupPreferences.setInsertRequiredAttrs(false);
-// cleanupPreferences.setInsertMissingTags(true);
-// cleanupPreferences.setQuoteAttrValues(true);
-// cleanupPreferences.setFormatSource(true);
-// cleanupPreferences.setConvertEOLCodes(false);
-//
-// // cleanup
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-// fHTMLCleanupProcessor.cleanupModel(structuredModel);
-// ((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-// // compare
-// String cleaned = structuredModel.getStructuredDocument().get();
-// String expectedFileName = "subscription.afterCleanup.jsp";
-// String expected = getFile(expectedFileName);
-// compare(expectedFileName, expected, cleaned);
-//
-// // release model
-// structuredModel.releaseFromRead();
-// }
-
- protected String readFile(String fileName) throws IOException {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[2048];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer, 0, bytesRead);
- //bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
- }
- finally {
- if (fileInputStream != null)
- fileInputStream.close();
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) throws UnsupportedEncodingException, IOException {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF-8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- // since in test code, no need to catch this
- // catch (Exception exception) {
- // Logger.logException(exception);
- // }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) throws IOException {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String cleaned) {
- if (cleaned.compareTo(expected) != 0) {
- if (Debug.failedTests) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== cleaned file ==========");
- System.out.println(cleaned);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== cleaned file ==========");
- String cleanedString = StringUtils.replace(cleaned, "\r", "\\r");
- cleanedString = StringUtils.replace(cleanedString, "\n", "\\n");
- cleanedString = StringUtils.replace(cleanedString, "\t", "\\t");
- System.out.println(cleanedString);
- System.out.println("=======================================");
- }
- assertTrue(false);
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
deleted file mode 100644
index 3920351e8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-
-public class FormatTester extends TestCase {
- protected IModelManager fModelManager = null;
- protected FormatProcessorXML fFormatProcessor = null;
- protected HTMLFormatProcessorImpl fHTMLFormatProcessor = null;
-
- public FormatTester(String name) {
- super(name);
-
- // get model manager
- fModelManager = StructuredModelManager.getModelManager();
-
- // get format processor
- fFormatProcessor = new FormatProcessorXML();
-
- // get HTML format processor
- fHTMLFormatProcessor = new HTMLFormatProcessorImpl();
- }
-
- public void testFormat261968() {
- // get model
- IStructuredModel structuredModel = getModel("261968.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "261968.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpen() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpen.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpen.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTagOpenTagClose() {
- // get model
- IStructuredModel structuredModel = getModel("tagOpenTagClose.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tagOpenTagClose.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatTags() {
- // get model
- IStructuredModel structuredModel = getModel("tags.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "tags.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatEmpty() {
- // get model
- IStructuredModel structuredModel = getModel("empty.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneSpace() {
- // get model
- IStructuredModel structuredModel = getModel("oneSpace.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatOneChar() {
- // get model
- IStructuredModel structuredModel = getModel("oneChar.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "oneChar.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpaces() {
- // get model
- IStructuredModel structuredModel = getModel("spaces.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "empty.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatChars() {
- // get model
- IStructuredModel structuredModel = getModel("chars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSpacesAndChars() {
- // get model
- IStructuredModel structuredModel = getModel("spacesAndChars.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "chars.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormat() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatSplitLines() {
- // get model
- IStructuredModel structuredModel = getModel("small.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "small.afterSplitLinesFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatBlockComments() {
- // get model
- IStructuredModel structuredModel = getModel("blockComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "blockComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineComments() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(999);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterDefaultFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testFormatInlineCommentsSplitLinesSplitMultiAttrs() {
- // get model
- IStructuredModel structuredModel = getModel("inlineComments.xml");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
- fFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- public void testHTMLFormat() {
- // get model
- IStructuredModel structuredModel = getModel("HitCounterIntro.html");
-
- // init FormatPreferences
- IStructuredFormatPreferences formatPreferences = fHTMLFormatProcessor.getFormatPreferences();
- ((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
- formatPreferences.setLineWidth(72);
- formatPreferences.setIndent("\t");
- formatPreferences.setClearAllBlankLines(false);
-
- // format
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = false;
- fHTMLFormatProcessor.formatModel(structuredModel);
- ((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = true;
-
- // compare
- String formatted = structuredModel.getStructuredDocument().get();
- String expectedFileName = "HitCounterIntro.afterDefaultFormat.html";
- String expected = getFile(expectedFileName);
- compare(expectedFileName, expected, formatted);
-
- // release model
- structuredModel.releaseFromRead();
- }
-
- protected String readFile(String fileName) {
- String inputString = null;
- InputStream fileInputStream = null;
-
- try {
- fileInputStream = getClass().getResourceAsStream(fileName);
-
- byte[] inputBuffer = new byte[1024];
- inputString = new String();
- int bytesRead = -1;
-
- while (true) {
- bytesRead = fileInputStream.read(inputBuffer);
- if (bytesRead == -1)
- break;
- String bufferString = new String(inputBuffer);
- bufferString = bufferString.substring(0, bytesRead);
- inputString = inputString.concat(bufferString);
- }
-
- if (fileInputStream != null)
- fileInputStream.close();
- }
- catch (IOException exception) {
- printException(exception);
- }
-
- return inputString;
- }
-
- protected static void printException(Exception exception) {
- exception.printStackTrace();
- }
-
- protected IStructuredModel getModel(String fileName) {
- IStructuredModel structuredModel = null;
- InputStream inputStream = null;
-
- try {
- String input = getFile(fileName);
- inputStream = new ByteArrayInputStream(input.getBytes("UTF8"));
- String id = inputStream.toString().concat(fileName);
- structuredModel = fModelManager.getModelForRead(id, inputStream, null);
- }
- catch (Exception exception) {
- exception.printStackTrace();
- }
- finally {
- try {
- inputStream.close();
- }
- catch (Exception exception) {
- // hopeless
- }
- }
-
- return structuredModel;
- }
-
- protected String getFile(String fileName) {
- return readFile("testfiles/".concat(fileName));
- }
-
- protected void compare(String testcaseName, String expected, String formatted) {
- if (formatted.compareTo(expected) != 0) {
- if (Debug.failedTests) {
- System.out.println();
- System.out.println(testcaseName + " failed");
- System.out.println("========== expected file ==========");
- System.out.println(expected);
- System.out.println("========== formatted file ==========");
- System.out.println(formatted);
- System.out.println("========== expected file ==========");
- String expectedString = StringUtils.replace(expected, "\r", "\\r");
- expectedString = StringUtils.replace(expectedString, "\n", "\\n");
- expectedString = StringUtils.replace(expectedString, "\t", "\\t");
- System.out.println(expectedString);
- System.out.println("========== formatted file ==========");
- String formattedString = StringUtils.replace(formatted, "\r", "\\r");
- formattedString = StringUtils.replace(formattedString, "\n", "\\n");
- formattedString = StringUtils.replace(formattedString, "\t", "\\t");
- System.out.println(formattedString);
- System.out.println("=======================================");
- }
- assertTrue(false);
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 048388219..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>
- /t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2>
- </t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- t3>
- </t3>
-</tag> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
- <t1></t1>
- <t2></t2
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2>/t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- t2></t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2>
- <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 > <t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 ><t3></t3>
-</tag>
-<tag>
- <t1></t1>
- <t2</t2 >t3></t3>
-</tag> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index cbace4dac..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
- action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
- height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG
- src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java
- servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to
- store the counter. If you have not already installed and configured
- your database for the WebSphere samples, refer to <A
- href="../Configuration/DBConfig.html">Database Configuration</A> for
- instructions. </FONT></P>
- <P><FONT size="-1"><A
- href="javascript:document.myForm.submit()" target="_self"> <B>Run
- this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
- name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a
- counter every time it is invoked </FONT>
- <UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that
- invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides
- information about the servlet to the WebSphere Application
- Server </FONT>
- </UL>
- </UL>
- <P><FONT size="-1">The Application Server processes
- .jsp files with its JSP 1.0 processor servlet. It handles the
- &lt;jsp:include ... /&gt; tag as a server-side include, replacing
- the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
- cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
- cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
- width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1"> How to use this sample on your
- web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any
- HTML page you have on your site. Rename the HTML file with a .jsp
- file extension, put the Java .class and .servlet files in the
- classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG
- src="../images/clearPixel.gif" width="15" height="1" alt="">
- <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca180a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
- <HEAD>
-<META http-equiv
-=
-"Content-Type"
-content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name = "myForm" method="post" action="../Controllers/SampleController">
- <TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD colspan="2">
- <IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
- </TR>
- <TR>
- <TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
- <TD align="LEFT" width="380">
- <P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
- </TD>
- </TR>
- <TR>
- <TD align="LEFT" valign="TOP">
- <P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
- <P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
- <P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
- <INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
- </TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">How this sample works:</FONT>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">This sample has:</FONT></P>
- <UL>
- <LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
- <LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
- <LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
- </UL>
- <P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the &lt;jsp:include ... /&gt; tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
- <TBODY>
- <TR>
- <TD align="CENTER">
- <P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
- </TD>
- </TR>
- <TR>
- <TD>
- <TABLE border="0" width="100%">
- <TBODY>
- <TR>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- <TD>
- <P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
- </TD>
- <TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b841349..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
- <!--
- No space
- -->
- <!--
- OneSpace
- -->
- <!--
- One tab
- -->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.-->
- <!--
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
- -->
- <!--
-
- This is a long paragraph.
-
- The text
- in this paragraph should NOT be re-flowed.
-
- -->
- <!--
-
-
-
- This is a long paragraph.
-
-
-
- The text
- in this paragraph should NOT be re-flowed.
-
-
-
- -->
- <item type="appetizer">
- <!-- a
- b-->
- <!-- a
- b -->
- <!--
- a
- b-->
- <!--
- a
- b -->
- <!--
- a
- b
- -->
- <!-- a
- b
- -->
- <!--
-
-
-
- a
-
-
-
- b
-
-
-
- -->
- <desc>Prosciutto ham with melon</desc>
- <!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 296987833..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
- <!-- comment on a new line -->
- <menu date="11/30/2000"><!-- inline comment after tag -->
- <rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
- -->
- <!-- block comment
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <item type="appetizer">
- <desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- </item>
- <!-- comment on a new line -->
- <!-- comment on a new line -->
- <!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
- One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
- <item type="appetizer">
-<!-- a
- b-->
-<!-- a
- b -->
-<!--
-a
- b-->
-<!--
-a
- b -->
-<!--
-a
- b
--->
-<!-- a
- b
- -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
- <desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
- Black = #000000
- Silver= #C0C0C0
- Gray = #808080
- White = #FFFFFF
--->
- <price units="usd">7.95</price>
- <!-- comment before missing end tag -->
-</menu> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f84a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index 847d8d7c6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-</HTML><HTML>
-</HTML> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a0020..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages. Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c
- </I></A>
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter: </I> </A>
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters. For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion. This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes: </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix. It is written in good ol' C.
-
-<BR ><BR >
-</LI><LI>
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list. This is written in Lisp, of all things. There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.
-It relies heavily on recursion, so it takes a different
-mindset to program in this language. But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR ><BR >
-
-</LI><LI>
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I> This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program. This works for any programming
-language as you can supply the comment character on the command line. This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
- an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.
-Peruse (peruse, mind you. I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c
- </I></A>
-<BR abc = "def"><BR abc = "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B>
-A math class written in Java using Object Oriented design principles. The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values. Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" >
-<I> RegressionCalc.java </I> </A> This is the main class that does the
-calculations. It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" >
-<I> MathClass.java </I> </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers. This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" >
-<I> Regression.java </I> </A> This is basically the main routine, or where the
-program starts. It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be: <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC. The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay. Really. If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk.
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt">
-<I> Lost LILO? Recover.</I> </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO. I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux. Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4bea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd" units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price units="usd" units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5e6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
- <desc>Warmed leek salad</desc><!-- inline comment after tag -->
- <desc>Warmed leek salad</desc><!-- inline comment after text -->
- <price units="usd">6.95<!-- inline comment after text --></price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price units="usd">
- <number /><!-- inline comment after tag -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text -->
- </price>
- <price
- units="usd"
- units="usd">
- 6.95<!-- inline comment after text and followed by text -->
- dollars
- </price>
- <price
- units="usd"
- units="usd">
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number /><!-- inline comment after tag -->
- <unit />
- </price>
- <price>
- <number />
- <!-- comment on a new line -->
- <unit />
- </price>
- <price><!-- inline comment --></price>
- <th>
- <b>Fahrenheit<!-- testing --></b>
- </th>
-</root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bcf4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc> <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/> <!-- inline comment after tag --></price>
-<price units="usd"> <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982d9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount=promotion price=57>
- <description>A wedding ring</description></Item></Invoice> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812da0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber="12345">
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Year></Date>
- <BillTo custNumber="custNumber"/>
- <BillTo custNumber= "custNumber"/>
- <BillTo custNumber ="custNumber"/>
- <BillTo custNumber = "custNumber"/>
- <BillTo custNumber="custNumber" name="Craig" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name="name" phone = "416-448-4414" />
- <BillTo custNumber = "X5739" name = "Craig" phone="phone"/>
- <BillTo custNumber="custNumber" name="name" phone="phone"/>
- <BillTo custNumber = "X5739" name="Craig Salter" phone="416-448-4414">
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </country></Address></BillTo></Header>
- <Item discount="promotion" price="57">
- <description>A wedding ring</description></Item></Invoice> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b59f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
- <Header invoiceNumber=12345>
- <Date>
- <Month>July</Month>
- <Day>15</Day>
- <Year>2001
- </Date>
- <BillTo custNumber=/>
- <BillTo custNumber= />
- <BillTo custNumber =/>
- <BillTo custNumber = />
- <BillTo custNumber name=Craig phone = 416-448-4414 />
- <BillTo custNumber = X5739 name phone = 416-448-4414 />
- <BillTo custNumber = X5739 name = Craig phone/>
- <BillTo custNumber name phone/>
- <BillTo custNumber = X5739 name="Craig Salter" phone=416-448-4414>
- <Address>
- <street1>IBM</street1>
- <street2>1150 Eglinton Ave East</street2>
- <city>Toronto</city>
- <state>Ontario</state>
- <zip>M3C 1H7</zip>
- <country>Canada
- </Header>
- <Item discount=promotion price=57>
- <description>A wedding ring \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c976..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
- type="hidden" name="command"
- value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
- name="previous_page" value="Login/Login.jsp"> <A
- href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40"
- value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40"
- value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67bd8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
- function submitForm(dest){
- document.myForm.action = dest
- document.myForm.submit()
- }
- </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<% session.removeAttribute("error_message");
- } %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
- <TBODY>
- <TR>
- <TD><FONT color="#993333"> username: </FONT></TD>
- <TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> password: </FONT></TD>
- <TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> drivername: </FONT></TD>
- <TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
- </TR>
- <TR>
- <TD><FONT color="#993333"> url: </FONT></TD>
- <TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
- </TR>
- </TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe2a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecba6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7fd6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name" v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e15..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel xmi.name="UML" xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv t="quid" v="3780E272032D" />
- <ixttv t="is_unit" v="TRUE" />
- <ixttv t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2cc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
- xmi.version="1.0"
- timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>XMI Toolkit</XMI.exporter>
-
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion>1.05</XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion
- xmi.name="UML"
- xmi.version="1.1">
- 1.05
- </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.metamodel
- xmi.name="UML"
- xmi.version="1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1"
- xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>
- ejb
- </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public" />
- <XMI.extension
- xmi.extender="IXT"
- xmi.extenderID="">
- <ixts s="IDL">
- <ixttv
- t="uuid"
- v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D" />
- <ixttv
- t="is_unit"
- v="TRUE" />
- <ixttv
- t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
- <ixttv
- t="is_loaded"
- v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv
- t="charSet"
- v="0" />
- <ixttv
- t="version"
- v="43" />
- <ixttv
- t="_written"
- v="&#34;Rose 6.5.9232.10&#34;" />
- </ixts>
- </XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5cc0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
- <XMI.header>
- <XMI.documentation>
- <XMI.exporter>
- XMI Toolkit
- </XMI.exporter>
-
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion>
- </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion></XMI.documentation>
- <XMI.documentation>
- <XMI.exporterVersion xmi.name = "UML" xmi.version = "1.1"> 1.05 </XMI.exporterVersion> </XMI.documentation>
- <XMI.metamodel xmi.name = "UML" xmi.version
- =
- "1.1" />
- </XMI.header>
-
- <XMI.content>
- <Model_Management.Package
- xmi.id="_1" xmi.uuid="Name:ejb">
- <Foundation.Core.ModelElement.name>ejb </Foundation.Core.ModelElement.name>
- <Foundation.Core.ModelElement.visibility xmi.value="public"/>
- <XMI.extension xmi.extender="IXT" xmi.extenderID="">
- <ixts s="IDL">
- <ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
- />
- </ixts>
- <ixts s="Rose">
- <ixttv
- t="quid"
- v="3780E272032D"
- />
- <ixttv
- t="is_unit"
- v="TRUE"
- />
- <ixttv t="file_name"
- v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;"
- />
- <ixttv t="is_loaded" v="TRUE" />
- </ixts>
- <ixts s="RosePetal">
- <ixttv t="charSet" v="0" />
- <ixttv t="version" v="43" />
- <ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" /></ixts></XMI.extension>
- </Model_Management.Package>
- </XMI.content>
-
-</XMI> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
deleted file mode 100644
index 01ad2f9a6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
- \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb569..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
- abc \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0f8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Create">
- <TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Delete">
- <TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
- value="Edit">
- <TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
- <html:hidden property="action" />
- <TABLE border="0" width="100%">
-
- <TR>
- <TH align="right"><bean:message key="prompt.username" />:</TH>
- <TD align="left"><bean:write name="user" property="username"
- filter="true" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
- <TD align="left"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:text property="host" size="50" />
- </logic:equal> <logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:hidden property="host" write="true" />
- </logic:notEqual></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
- <TD align="left"><html:text property="username" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
- <TD align="left"><html:password property="password" size="50" /></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
- <TD align="left"><html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label" />
- </html:select></TD>
- </TR>
-
- <TR>
- <TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
- <TD align="left"><html:checkbox property="autoConnect" /></TD>
- </TR>
-
- <TR>
- <TD align="right"><logic:equal name="subscriptionForm"
- property="action" scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm" />
- </html:submit>
- </logic:equal> <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save" />
- </html:submit>
- </logic:equal></TD>
- <TD align="left"><logic:notEqual name="subscriptionForm"
- property="action" scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset" />
- </html:reset>
- </logic:notEqual> &nbsp; <html:cancel>
- <bean:message key="button.cancel" />
- </html:cancel></TD>
- </TR>
-
- </TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea48..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
- java.util.ArrayList list = new java.util.ArrayList();
- list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
- list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
- pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
- <tr>
- <th align="right">
- <bean:message key="prompt.username"/>:
- </th>
- <td align="left">
- <bean:write name="user" property="username" filter="true"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailHostname"/>:
- </th>
- <td align="left">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:text property="host" size="50"/>
- </logic:equal>
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:hidden property="host" write="true"/>
- </logic:notEqual>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailUsername"/>:
- </th>
- <td align="left">
- <html:text property="username" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailPassword"/>:
- </th>
- <td align="left">
- <html:password property="password" size="50"/>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.mailServerType"/>:
- </th>
- <td align="left">
- <html:select property="type">
- <html:options collection="serverTypes" property="value"
- labelProperty="label"/>
- </html:select>
- </td>
- </tr>
-
- <tr>
- <th align="right">
- <bean:message key="prompt.autoConnect"/>:
- </th>
- <td align="left">
- <html:checkbox property="autoConnect"/>
- </td>
- </tr>
-
- <tr>
- <td align="right">
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Create">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:submit>
- <bean:message key="button.confirm"/>
- </html:submit>
- </logic:equal>
- <logic:equal name="subscriptionForm" property="action"
- scope="request" value="Edit">
- <html:submit>
- <bean:message key="button.save"/>
- </html:submit>
- </logic:equal>
- </td>
- <td align="left">
- <logic:notEqual name="subscriptionForm" property="action"
- scope="request" value="Delete">
- <html:reset>
- <bean:message key="button.reset"/>
- </html:reset>
- </logic:notEqual>
- &nbsp;
- <html:cancel>
- <bean:message key="button.cancel"/>
- </html:cancel>
- </td>
- </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa78456..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-< \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e487a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235dfa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag>
- <tag></tag>
- <tag></tag>
- <tag></tag>
- <tag></tag> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949bb5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag > \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f838f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
- /* (non-Javadoc)
- * @see java.io.InputStream#read()
- */
- public int read() throws IOException {
- return -1;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index 9fe4877d8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * This class is to test very basics of content type handlers.
- *
- * It tests that
- *
- * BVT: content registry can be / is created 5 expected contentTypeIdentifiers
- * can be created/found based on id. there is one and only one default content
- * type handler.
- *
- *
- *
- *
- */
-public class TestContentTypeHandlers extends TestCase {
- private static final boolean DEBUG = false;
-
- public TestContentTypeHandlers(String name) {
- super(name);
- }
-
- private static IContentTypeManager getContentTypeRegistry() {
- IContentTypeManager registry = Platform.getContentTypeManager();
- return registry;
- }
-
- public void testCreation() {
- IContentTypeManager registry = getContentTypeRegistry();
- assertTrue("content type identifer registry must exist", registry != null);
- if (DEBUG) {
- IContentType[] allTypes = registry.getAllContentTypes();
- for (int i = 0; i < allTypes.length; i++) {
- System.out.println(allTypes[i]);
-
- }
- }
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_SSEXML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have custom XML type ", identifier != null);
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getContentType(id);
- assertTrue("content type identifier " + id + " does not have DTD type ", identifier != null);
- }
-
- public void testXMLExistsByFileExtension() throws IOException {
- String filename = "test.xml";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have XML type ", identifier != null);
- }
-
- public void testHTMLExistsByFileExtension() throws IOException {
- String filename = "test.html";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have HTML type ", identifier != null);
- }
-
- public void testJSPExistsByFileExtension() throws IOException {
- String filename = "test.jsp";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have JSP type ", identifier != null);
- }
-
- public void testCSSExistsByFileExtension() throws IOException {
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have CSS type ", identifier != null);
- }
-
- public void testDTDExistsByFileExtension() throws IOException {
- String filename = "test.dtd";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("content type identifier for " + filename + " does not have DTD type ", identifier != null);
- }
-
- public void testMultipleDefinitions() throws IOException {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- String filename = "test.css";
- IContentTypeManager registry = getContentTypeRegistry();
- IContentType identifier1 = registry.getContentType(id);
- IContentType identifier2 = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
- assertTrue("mulitple content type identifiers need to be equal (but not same instance) ", identifier1.equals(identifier2));
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
deleted file mode 100644
index 420ffb932..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class TestModelHandlers extends TestCase {
- private static ModelHandlerRegistry getModelHandlerRegistry() {
- ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
- return registry;
- }
-
- public TestModelHandlers() {
- super();
- }
-
- public void testCreation() {
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- assertTrue("model handler registry must exist", registry != null);
- }
-
- public void testCSSExists() {
- String id = ContentTypeIdForCSS.ContentTypeID_CSS;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testCSSExistsFromFilename() throws IOException {
- String filename = "test.css";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForCSS.ContentTypeID_CSS));
- }
-
- public void testDTDExists() {
- String id = "org.eclipse.wst.dtd.core.dtdsource";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testDTDExistsFromFilename() throws IOException {
- String filename = "test.dtd";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals("org.eclipse.wst.dtd.core.dtdsource"));
- }
-
- public void testHTMLExists() {
- String id = ContentTypeIdForHTML.ContentTypeID_HTML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testHTMLExistsFromFilename() throws IOException {
- String filename = "test.html";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForHTML.ContentTypeID_HTML));
- }
-
- public void testJSPExists() {
- String id = ContentTypeIdForJSP.ContentTypeID_JSP;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
- }
-
- public void testJSPExistsFromFilename() throws IOException {
- String filename = "test.jsp";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForJSP.ContentTypeID_JSP));
- }
-
- public void testXMLExists() {
- String id = ContentTypeIdForXML.ContentTypeID_XML;
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerForContentTypeId(id);
- assertEquals("model handler registry does not have XML type ", id, handler.getAssociatedContentTypeId());
- }
-
- public void testXMLExistsFromFilename() throws IOException {
- String filename = "test.xml";
- ModelHandlerRegistry registry = getModelHandlerRegistry();
- IModelHandler handler = registry.getHandlerFor(filename, null);
- assertEquals("model handler registry does not have XML type ", ContentTypeIdForXML.ContentTypeID_XML, handler.getAssociatedContentTypeId());
- }
-
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
deleted file mode 100644
index 7cb892192..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This test will cause a "region management error" to be thrown in DOM parser
- * (and its subsequent 'handleRefresh' to be called). This is "normal" in this
- * error case, of appending an jsp element to an html document. This
- * error/exception is not normally printed out, but is if 'debug' is turned on.
- */
-
-public class TestOrphan extends TestCase {
-
- private static final String fCategory = "unittests";
-
- public TestOrphan(String name) {
-
- super(name);
- }
-
- private Document getJSPDoc() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Document getHTMLDoc() {
-
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- Document doc = structuredModel.getDocument();
- return doc;
- }
-
- private Element makeElement(Document document) {
-
- Element element = document.createElement("IMG");
- element.setAttribute("src", "<bean:message />");
- return element;
- }
-
- public void testNonOrphanInHTMLDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInHTMLDoc");
- Document doc = getHTMLDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInJSPDoc() {
-
- Logger.trace(fCategory, "testNonOrphanInJSPDoc");
- Document doc = getJSPDoc();
- Element element = makeElement(doc);
- AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- doc.appendChild(element);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void testNonOrphanInBoth() {
-
- Logger.trace(fCategory, "testNonOrphanInBoth");
- Document jspDoc = getJSPDoc();
- Element commonElement = makeElement(jspDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- jspDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- Document htmlDoc = getHTMLDoc();
- // this test will cause a "region management error" to be
- // thrown in parser (and its subsequent 'handleRefresh').
- // this is "normal" in this error case, of appending an jsp
- // element to an html document. This error/exception is not
- // normally printed out, but is if 'debug' is turned on.
- htmlDoc.appendChild(commonElement);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- }
-
- public void testNonOrphanInBothReversedOrder() {
-
- Logger.trace(fCategory, "testNonOrphanInBothReversedOrder");
- Document htmlDoc = getHTMLDoc();
- Element commonElement = makeElement(htmlDoc);
- AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
- String attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- htmlDoc.appendChild(commonElement);
- boolean isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertFalse(isJspValue);
- Document jspDoc = getJSPDoc();
- // this little test shows its important to
- // actually create the element with the right kind of
- // document, not just append.
- // (and, append is needed too, as can be seen by
- // commenting out one or the other of the following
- // two lines.
- commonElement = makeElement(jspDoc);
- jspDoc.appendChild(commonElement);
- //
- attr = (AttrImpl) commonElement.getAttributeNode("src");
- attrValue = attr.getValue();
- Logger.trace(fCategory, "attrValue: " + attrValue);
- isJspValue = attr.hasNestedValue();
- Logger.trace(fCategory, "isJspValue: " + isJspValue);
- assertTrue(isJspValue);
- }
-
- public void doBothTests() {
-
- testNonOrphanInHTMLDoc();
- testNonOrphanInJSPDoc();
- testNonOrphanInBoth();
- testNonOrphanInBothReversedOrder();
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
deleted file mode 100644
index 69f5cf408..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-public class TestModelAdapters extends TestCase {
-
-
-
- public void testJSPModel() throws IOException {
- IModelManager modelManager = getModelManager();
- IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- try {
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) structuredModel.getAdapter(ModelQueryAdapter.class);
- assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
- IStructuredModel newModel = structuredModel.newInstance();
- // IDOMDocument newDocument = ((IDOMModel)
- // newModel).getDocument();
- // INodeNotifier notifier = newDocument;
- ModelQueryAdapter result = (ModelQueryAdapter) newModel.getAdapter(ModelQueryAdapter.class);
- assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
- }
- finally {
- // even though model is unmanaged, release still required, since
- // adapter factories, etc., may be depending on it.
- structuredModel.releaseFromEdit();
- // if above complete's normally (with no exceptions)
- // consider passed.
- assertTrue(true);
- }
- }
-
- private IModelManager getModelManager() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
deleted file mode 100644
index 89fadcf9b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelRelease extends TestCase {
-
-
-
- public void testJSPModel() {
- IModelManager modelManager = getModelManager();
- IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- // even though model is unmanaged, release still required, since
- // adapter factories, etc., may be depending on it.
- structuredModel.releaseFromEdit();
- // if above complete's normally (with no exceptions)
- // consider passed.
- assertTrue(true);
- }
-
- private IModelManager getModelManager() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
deleted file mode 100644
index 59f786a78..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelWithNoFile extends TestCase {
-
- public void testJSPModel() {
- IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
- assertTrue(test);
- structuredModel.releaseFromEdit();
- assertTrue(true);
- }
-
- public void testBug116066_1() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = null;
-
- // Create new project
- IProject project = createSimpleProject("bug116066_1", null, null);
-
- IFile testFile = project.getFile("nonExistant.jsp");
- assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
- // Get the model and set a reference to that tag library into it
- try {
- model = modelManager.getNewModelForEdit(testFile, false);
- assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
- model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- public void testBug116066_2() {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = null;
-
- // Create new project
- IProject project = createSimpleProject("bug116066_2", null, null);
- // Copy a TLD into the project
- IFile tld = copyBundleEntryIntoWorkspace("/testfiles/116066/tagdep.tld", "/bug116066_2/tagdep.tld");
- assertNotNull("TLD entry was not copied properly", tld);
- assertTrue("TLD IFile does not exist", tld.exists());
-
- IFile testFile = project.getFile("nonExistant.jsp");
- assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
- // Get the model and set a reference to that tag library into it
- try {
- model = modelManager.getNewModelForEdit(testFile, false);
- assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
- model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
-
- private IFile copyBundleEntryIntoWorkspace(String entryname, String fullPath) {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- return file;
- }
-
- private IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- assertTrue(project.exists());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
deleted file mode 100644
index d3a1ac494..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.taglibindex;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-
-public class BundleResourceUtil {
-
- public static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- Enumeration entries = JSPCoreTestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
- while (entries != null && entries.hasMoreElements()) {
- String entryPath = entries.nextElement().toString();
- String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
- if (entryPath.endsWith("/")) {
- IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
- if (!folder.exists()) {
- folder.create(true, true, new NullProgressMonitor());
- }
- _copyBundleEntriesIntoWorkspace(entryPath, targetPath);
- }
- else {
- _copyBundleEntryIntoWorkspace(entryPath, targetPath);
- }
- // System.out.println(entryPath + " -> " + targetPath);
- }
- }
-
- public static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
- IFile file = null;
- URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
- if (entry != null) {
- try {
- byte[] b = new byte[2048];
- InputStream input = entry.openStream();
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- int i = -1;
- while ((i = input.read(b)) > -1) {
- output.write(b, 0, i);
- }
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
- if (file != null) {
- if (!file.exists()) {
- file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
- }
- else {
- file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
- }
- }
- }
- catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- return file;
- }
-
- public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- _copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
- ResourcesPlugin.getWorkspace().checkpoint(ResourcesPlugin.getWorkspace().isAutoBuilding());
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- }
-
- public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) throws CoreException {
- final IFile file[] = new IFile[1];
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
- ResourcesPlugin.getWorkspace().checkpoint(ResourcesPlugin.getWorkspace().isAutoBuilding());
- }
- };
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- return file[0];
- }
-
- public static IProject createSimpleProject(String name, IPath location, String[] natureIds) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
- if (location != null) {
- description.setLocation(location);
- }
- if (natureIds != null) {
- description.setNatureIds(natureIds);
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- try {
- project.create(description, new NullProgressMonitor());
- project.open(new NullProgressMonitor());
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return project;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
deleted file mode 100644
index 841b4e78c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.taglibindex;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.IURLRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-
-/**
- * Tests for the TaglibIndex.
- */
-public class TestIndex extends TestCase {
- String wtp_autotest_noninteractive = null;
-
- protected void setUp() throws Exception {
- super.setUp();
- String noninteractive = System.getProperty("wtp.autotest.noninteractive");
- if (noninteractive != null)
- wtp_autotest_noninteractive = noninteractive;
- System.setProperty("wtp.autotest.noninteractive", "true");
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- if (wtp_autotest_noninteractive != null)
- System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
- }
-
- public void testBug118251_e() throws Exception {
- String url = "http://example.com/sample2_for_118251-e";
-
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-e", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-e", "/bug_118251-e");
- // bug_118251-e/WebContent/WEB-INF/web.xml
- // bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-e/WebContent/META-INF/MANIFEST.MF
- // bug_118251-e/WebContent/test1.jsp
- // bug_118251-e/.classpath
- // bug_118251-e/.project
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
- assertNotNull("record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 2, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-e/WebContent/WEB-INF/sample_tld.jar");
-
- url = "http://example.com/sample-taglib";
- taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
- assertEquals("wrong number of taglib records found after copying", 3, records.length);
- }
-
- public void testBug118251_f() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-f", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-f", "/bug_118251-f");
- // bug_118251-f/WebContent/WEB-INF/web.xml
- // bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-f/WebContent/META-INF/MANIFEST.MF
- // bug_118251-f/WebContent/test1.jsp
- // bug_118251-f/.classpath
- // bug_118251-f/.project
- String url = "http://example.com/sample-taglib";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
- assertNull("record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar");
-
- taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
- assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
- assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
- assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
- assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getURI());
- URL recordURL = ((IURLRecord) taglibRecord).getURL();
- assertNotNull("record has no URL", recordURL);
- assertTrue("record has wrong URL", recordURL.toString().length() > 4);
- assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
- assertEquals("record has wrong URL", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 81));
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF/web.xml"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- }
-
- public void testBug118251_g() throws Exception {
- // Create new project
- IProject project = BundleResourceUtil.createSimpleProject("bug_118251-g", null, null);
- assertTrue(project.exists());
- ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g"));
- assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
- BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-g", "/bug_118251-g");
- // bug_118251-g/Web Content/WEB-INF/web.xml
- // bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
- // bug_118251-g/Web Content/META-INF/MANIFEST.MF
- // bug_118251-g/Web Content/test1.jsp
- // bug_118251-g/.classpath
- // bug_118251-g/.project
- String url = "http://example.com/sample-taglib";
- ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
- assertNull("record found for " + url, taglibRecord);
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
- assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
- /*
- * increase by <b>one</b> for the URL to the TLD in the jar (one
- * implicit for the TLD in the jar as a resource and another implicit
- * overwriting it with the same URL to the TLD in the jar on the
- * classpath)
- */
- BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar");
-
- taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
- assertNotNull("no record found for " + url, taglibRecord);
- assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
- assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
- assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
- assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getURI());
- URL recordURL = ((IURLRecord) taglibRecord).getURL();
- assertNotNull("record has no URL", recordURL);
- assertTrue("record has wrong URL", recordURL.toString().length() > 4);
- assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
- assertEquals("record has wrong URL", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 82));
-
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF/web.xml"));
- assertEquals("wrong number of taglib records found after copying", 4, records.length);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml
deleted file mode 100644
index 809e29b73..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/test.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
- <!-- sets the properties plugin-name, and library-file -->
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.core.tests" />
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="org.eclipse.jst.jsp.core.tests.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property
- name="wst-folder"
- value="${eclipse-home}/wst_folder" />
- <delete
- dir="${wst-folder}"
- quiet="true" />
- <ant
- target="core-test"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${wst-folder}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="org.eclipse.jst.jsp.core.tests.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
deleted file mode 100644
index bfdd67375..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version = "1.0" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglib_1_2.dtd">
-<taglib>
- <tlib-version>1.1</tlib-version>
- <jsp-version>1.1</jsp-version>
- <uri>tagdependent</uri>
- <short-name>tagdependent</short-name>
- <description>
- This tag library demonstrates tagdependent tag handling
- using its "code" tag.
- </description>
- <tag>
- <name>code</name>
- <tag-class>com.example.tagdep.CodeTag</tag-class>
- <body-content>tagdependent</body-content>
- <attribute>
- <name>fontName</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <name>bold</name>
- <type>boolean</type>
- </attribute>
- <attribute>
- <name>italic</name>
- <type>boolean</type>
- </attribute>
- </tag>
- <small-icon>browser_editor.gif</small-icon>
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
deleted file mode 100644
index 2a08dbaa7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-e</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
deleted file mode 100644
index f31e57857..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
deleted file mode 100644
index 22e550ecb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-f</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
deleted file mode 100644
index 1d5f5d40c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="Web Content/WEB-INF/lib/sample_tld.jar"/>
- <classpathentry kind="output" path="Web Content/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
deleted file mode 100644
index 5041b27e9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>bug_118251-g</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
- <tlibversion>0.0.1</tlibversion>
- <jspversion>1.2</jspversion>
- <shortname>sample</shortname>
- <uri>http://example.com/sample2_for_118251-e</uri>
- <info>
- This tag library contains just one tag. Ha ha!
- </info>
-
- <tag>
- <name>code</name>
- <tagclass>sample.taglib.CodeTag</tagclass>
- <bodycontent>tagdependent</bodycontent>
- <attribute>
- <name>fontAttributes</name>
- </attribute>
- <attribute>
- <name>commentColor</name>
- </attribute>
- <attribute>
- <name>stringColor</name>
- </attribute>
- </tag>
- </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- test1</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
- <taglib>
- <taglib-uri>/tags/sample2</taglib-uri>
- <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
- </taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
deleted file mode 100644
index 48030320d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The accompanying jar contains a TLD with a URI specified in
-it as well as a big long file that should slow down the
-taglib indexing.
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath b/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f00..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d693..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.tests.encoding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 677dbeed1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Mon May 30 19:08:53 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f9136dfe9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri May 27 23:39:08 EDT 2005
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index db400fcf3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: JSP Encoding Tests Plug-in
-Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.0
-Bundle-ClassPath: jspencodingtests.jar
-Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.tests.encoding.jsp
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.junit,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 7a820cbc3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = plugin.xml,\
- jspencodingtests.jar,\
- testfiles/,\
- test.xml,\
- META-INF/,\
- about.html
-src.includes = testfiles/,\
- test.xml,\
- plugin.xml,\
- META-INF/
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 87cfaa3f0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
- private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
- public static Test suite() {
- return new JSPEncodingTestSuite();
- }
-
- public JSPEncodingTestSuite() {
- super("JSP Encoding Test Suite");
- for (int i = 0; i < classes.length; i++) {
- addTest(new TestSuite(classes[i], classes[i].getName()));
- }
- }
-
- /**
- * @param theClass
- */
- public JSPEncodingTestSuite(Class theClass) {
- super(theClass);
- }
-
- /**
- * @param theClass
- * @param name
- */
- public JSPEncodingTestSuite(Class theClass, String name) {
- super(theClass, name);
- }
-
- /**
- * @param name
- */
- public JSPEncodingTestSuite(String name) {
- super(name);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 3798ccb92..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPEncodingTestsPlugin extends Plugin {
- // The shared instance.
- private static JSPEncodingTestsPlugin plugin;
-
- public static List getAllTestFiles(String topDirName) {
- List result = null;
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + topDirName;
- File topDir = new File(location);
- if (!topDir.isDirectory()) {
- throw new IllegalArgumentException(topDirName + " is not a directory");
- }
- else {
- result = getFilesInDir(topDir);
- }
- return result;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPEncodingTestsPlugin getDefault() {
- return plugin;
- }
-
- private static List getFilesInDir(File topDir) {
- List files = new ArrayList();
- File[] topFiles = topDir.listFiles();
- for (int i = 0; i < topFiles.length; i++) {
- File file = topFiles[i];
- if (file.isFile()) {
- files.add(file);
- }
- else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
- List innerFiles = getFilesInDir(file);
- files.addAll(innerFiles);
- }
- }
- return files;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = Platform.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null ? bundle.getString(key) : key);
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-
- public static Reader getTestReader(String filepath) throws FileNotFoundException {
- URL installURL = getInstallLocation();
- // String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- Reader result = new FileReader(location);
- return result;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * The constructor.
- */
- public JSPEncodingTestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return null;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index bed934f5c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
- /**
- * Ensures that an InputStream has mark/reset support.
- */
- private static InputStream getMarkSupportedStream(InputStream original) {
- if (original == null)
- return null;
- if (original.markSupported())
- return original;
- return new BufferedInputStream(original);
- }
- private boolean DEBUG = false;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private int READ_BUFFER_SIZE = 8000;
-
- public JSPEncodingTests(String name) {
- super(name);
- }
-
- private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
- File file = JSPEncodingTestsPlugin.getTestFile(filename);
- if (!file.exists())
- throw new IllegalArgumentException(filename + " was not found");
- InputStream inputStream = new FileInputStream(file);
- // InputStream inStream = getClass().getResourceAsStream(filename);
- InputStream istream = getMarkSupportedStream(inputStream);
- try {
- detector.set(istream);
- EncodingMemento encodingMemento = ((JSPResourceEncodingDetector)detector).getEncodingMemento();
- String foundIANAEncoding = encodingMemento.getJavaCharsetName();
- // I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
- // since
- // some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
- // We do want to be tolerant on input, and accept either, but I
- // think
- // that SupportedJavaEncodings needs to be changed to "recommend"
- // Shift_JIS.
- boolean expectedIANAResult = false;
- expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
- assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
- // a very simple read test ... will cause JUnit error (not fail)
- // if throws exception.
- ensureCanRead(filename, foundIANAEncoding, istream);
- }
- finally {
- if (istream != null) {
- istream.close();
- }
- if (inputStream != null) {
- inputStream.close();
- }
- }
- }
-
- /**
- * This method just reads to stream, to be sure it can be read per
- * encoding, without exception.
- */
- private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
- Charset charset = Charset.forName(encoding);
- CharsetDecoder charsetDecoder = charset.newDecoder();
- charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
- charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
- InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
- StringBuffer stringBuffer = readInputStream(reader);
- if (DEBUG) {
- System.out.println();
- System.out.println(filename);
- System.out.println(stringBuffer.toString());
- }
- }
-
- private StringBuffer readInputStream(Reader reader) throws IOException {
-
- StringBuffer buffer = new StringBuffer();
- int numRead = 0;
- char tBuff[] = new char[READ_BUFFER_SIZE];
- while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
- buffer.append(tBuff, 0, numRead);
- }
- return buffer;
- }
-
- public void testdefect4205wpsjsp() throws IOException {
- String filename = fileLocation + "defect_4205_wps.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testJSPEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- /**
- * Caution, when this file prints out in console (when debug set to true,
- * it appears incorrect (due to font problems in console).
- */
- public void testUTF16() throws IOException {
- String filename = fileLocation + "testUTF16.jsp";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
- doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
- }
-
- /**
- * This test shows unicode BOM should take priority over settings/defaults
- * Note: UTF-16 == UTF-16BE
- */
- public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
- String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF16WithJapaneseChars() throws IOException {
- String filename = fileLocation + "utf16WithJapaneseChars.jsp";
- doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
- }
-
- public void testUTF83ByteBOM() throws IOException {
- String filename = fileLocation + "UTF8With3ByteBOM.jsp";
- doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
- }
-
- public void testXMLIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
- public void testXMLNoEncoding() throws IOException {
- String filename = fileLocation + "noEncoding.jsp";
- doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
- }
-
- public void testXMLNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.jsp";
- String ianaInFile = "ISO-8859-8";
- doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index 4cb3db87f..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
- private boolean DEBUG = false;
- private String fCharset;
- private String fContentType;
- private String fContentTypeValue;
- private final String fileDir = "jsp/";
- private final String fileHome = "testfiles/";
- private final String fileLocation = fileHome + fileDir;
- private String fPageEncodingValue = null;
- private String fXMLDecEncodingName;
- private String fLanguage;
-
- private void doTestFile(String filename, String expectedName) throws IOException {
- doTestFile(filename, expectedName, null, null);
- }
-
- private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws IOException {
- JSPHeadTokenizer tokenizer = null;
- Reader fileReader = null;
- try {
- if (DEBUG) {
- System.out.println();
- System.out.println(" " + filename);
- System.out.println();
- }
- fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
- tokenizer = new JSPHeadTokenizer(fileReader);
- }
- catch (IOException e) {
- System.out.println("Error opening file \"" + filename + "\"");
- }
-
- HeadParserToken token = parseHeader(tokenizer);
- String resultValue = getAppropriateEncoding();
- fileReader.close();
- if (finalTokenType != null) {
- assertTrue("did not end as expected. found: " + token.getType(), finalTokenType.equals(token.getType()));
- }
-
- if (expectedName == null) {
- assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
- }
- else {
- assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
- }
-
- String foundContentType = getContentType();
- if (expectedContentType == null) {
- assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
- }
- else {
- assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
- }
-
- }
-
- // public void testMalformedNoEncoding() {
- // String filename = fileLocation + "MalformedNoEncoding.jsp";
- // doTestFile(filename);
- // }
- // public void testMalformedNoEncodingXSL() {
- // String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
- // doTestFile(filename);
- // }
- // public void testNoEncoding() {
- // String filename = fileLocation + "NoEncoding.jsp";
- // doTestFile(filename);
- // }
- public void testNormalNonDefault() throws IOException {
- String filename = fileLocation + "NormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8");
- }
-
- // public void testNormalPageCaseNonDefault() {
- // String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
- // doTestFile(filename);
- // }
- // public void testdefect223365() {
- // String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
- // doTestFile(filename);
- // }
- /**
- * returns encoding according to priority: 1. XML Declaration 2. page
- * directive pageEncoding name 3. page directive contentType charset name
- */
- private String getAppropriateEncoding() {
- String result = null;
- if (fXMLDecEncodingName != null)
- result = fXMLDecEncodingName;
- else if (fPageEncodingValue != null)
- result = fPageEncodingValue;
- else if (fCharset != null)
- result = fCharset;
- return result;
- }
-
- private String getContentType() {
- return fContentType;
- }
-
- private boolean isLegalString(String tokenType) {
- boolean result = false;
- if (tokenType != null) {
- result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
- }
- return result;
- }
-
- /**
- * This method should be exactly the same as what is in
- * JSPResourceEncodingDetector
- *
- * @param contentType
- */
- private void parseContentTypeValue(String contentType) {
- Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
- String[] parts = pattern.split(contentType);
- if (parts.length > 0) {
- // if only one item, it can still be charset instead of
- // contentType
- if (parts.length == 1) {
- if (parts[0].length() > 6) {
- String checkForCharset = parts[0].substring(0, 7);
- if (checkForCharset.equalsIgnoreCase("charset")) {
- int eqpos = parts[0].indexOf('=');
- eqpos = eqpos + 1;
- if (eqpos < parts[0].length()) {
- fCharset = parts[0].substring(eqpos);
- fCharset = fCharset.trim();
- }
- }
- else {
- fContentType = parts[0];
- }
- }
- }
- else {
- fContentType = parts[0];
- }
- }
- if (parts.length > 1) {
- fCharset = parts[1];
- }
- }
-
- /**
- * Give's priority to encoding value, if found else, looks for contentType
- * value;
- */
- private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws IOException {
- fPageEncodingValue = null;
- fCharset = null;
- fContentType = null;
- HeadParserToken token = null;
- HeadParserToken finalToken = null;
- do {
- token = tokenizer.getNextToken();
- String tokenType = token.getType();
-
- if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fXMLDecEncodingName = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fPageEncodingValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fContentTypeValue = valueToken.getText();
- }
- }
- }
- else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
- if (tokenizer.hasMoreTokens()) {
- HeadParserToken valueToken = tokenizer.getNextToken();
- String valueTokenType = valueToken.getType();
- if (isLegalString(valueTokenType)) {
- fLanguage = valueToken.getText();
- }
- }
- }
- }
- while (tokenizer.hasMoreTokens());
- if (fContentTypeValue != null) {
- parseContentTypeValue(fContentTypeValue);
- }
- finalToken = token;
- return finalToken;
- }
-
- public void testBestCase() throws IOException {
- String filename = fileLocation + "nomalDirectiveCase.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testMinimalPageDirective() throws IOException {
- String filename = fileLocation + "minimalPageDirective.jsp";
- doTestFile(filename, null, null, "text/html");
- }
-
- public void testIllFormed() throws IOException {
- String filename = fileLocation + "testIllFormed.jsp";
- doTestFile(filename, null);
- }
-
- public void testIllFormed2() throws IOException {
- String filename = fileLocation + "testIllFormed2.jsp";
- doTestFile(filename, "UTF-8");
- }
-
- public void testIllformedNormalNonDefault() throws IOException {
- String filename = fileLocation + "IllformedNormalNonDefault.jsp";
- doTestFile(filename, "ISO-8859-8", null, "text/html");
- }
-
- public void testEmptyFile() throws IOException {
- String filename = fileLocation + "EmptyFile.jsp";
- doTestFile(filename, null);
- }
-
- public void testNomalDirectiveCaseUsingXMLSyntax() throws IOException {
- String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirective() throws IOException {
- String filename = fileLocation + "testNoPageDirective.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalPageDirectiveWithXMLDecl() throws IOException {
- String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
- doTestFile(filename, "ISO-8859-1", null, "text/html");
- }
-
-
- public void testNoPageDirectiveAtFirst() throws IOException {
- String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
- doTestFile(filename, "ISO-8859-2", null, "text/html");
- }
-
- public void testNoPageDirectiveInLargeFile() throws IOException {
- String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
- doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
- }
-
- public void testNormalCaseWithNeither() throws IOException {
- String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
- doTestFile(filename, null);
- }
-
- public void testNormalCharset() throws IOException {
- String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
- doTestFile(filename, "ISO-8859-3", null, "text/html");
- }
-
- public String getLanguage() {
- return fLanguage;
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index ae113dbd2..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
- protected void doTest(String expectedContentType, String filePath, Class expectedException, String expectedJSPContentType) throws CoreException, IOException {
- super.doTest(expectedContentType, filePath, expectedException);
-
- IFile file = (IFile) getTestProject().findMember(filePath);
- assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
- IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
- IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
- String streamJSPContentType = (String) streamContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-
- checkResults(expectedJSPContentType, streamJSPContentType);
-
-
- String fileJSPContentType = (String) fileContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
- checkResults(expectedJSPContentType, fileJSPContentType);
-
-
- }
-
- private void checkResults(String expectedJSPContentType, String foundJSPContentType) {
- if (expectedJSPContentType == null) {
- assertTrue("expected no contentType, but found: " + foundJSPContentType, foundJSPContentType == null);
- }
- else {
- assertTrue("expected " + expectedJSPContentType + " but found " + foundJSPContentType, expectedJSPContentType.equals(foundJSPContentType));
- }
- }
-
- public void testFile100() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null, "text/html");
- }
-
- public void testFile101() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null, "text/html");
- }
-
- public void testFile102() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null, "text/html");
- }
-
- public void testFile65() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null, null);
- }
-
- public void testFile66() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile67() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
- }
-
- public void testFile68() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null, "text/html");
- }
-
- public void testFile69() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null, null);
- }
-
- public void testFile70() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null, null);
- }
-
- public void testFile71() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null, "text/html");
- }
-
- public void testFile72() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null, null);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null, "text/html");
- }
-
- public void testFile74() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null, null);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null, "text/html");
- }
-
- public void testFile76() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null, "text/html");
- }
-
- public void testFile77() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null, null);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null, "text/html");
- }
- public void nomalDirectiveCasewithXMLDecl() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp", null, "text/html");
- }
- public void testFile79() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null, "text/html");
- }
-
- public void testFile80() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
- public void testFile81() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null, null);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile83() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
- }
-
- public void testFile84() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null, null);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null, null);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null, null);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null, null);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null, null);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null, null);
- }
-
-
- public void testFile90() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null, "text/html");
- }
-
- public void testFile91() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null, null);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null, null);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null, null);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null, null);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null, null);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null, null);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null, null);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null, "text/html");
- }
-
- public void testFile99() throws CoreException, IOException {
- doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null, "text/html");
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index 3c80bdc3d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- Configurable Properties -->
-
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.." /> -->
-
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.tests.encoding" />
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="org.eclipse.jst.jsp.tests.encoding.*xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property
- name="wst-folder"
- value="${eclipse-home}/wst_folder" />
- <delete
- dir="${wst-folder}"
- quiet="true" />
- <ant
- target="core-test"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${wst-folder}" />
- <property
- name="plugin-name"
- value="org.eclipse.jst.jsp.tests.encoding" />
- <property
- name="classname"
- value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!--<delete dir="${workspace}" quiet="true" />-->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="org.eclipse.jst.jsp.tests.encoding.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- <!--<emailResults resultsFile="${build-results-home}/${plugin-name}.xml" addresslist="david_williams@us.ibm.com" /> -->
- </target>
-
-</project> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75a3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15e7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australi
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d5d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australi
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76ce8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e681a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248fe7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba82..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6a8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
- background-color: #ffffff !important;
-}
-H1 {
- color: #0000ff !important;
- text-align: center !important;
-}
-TH {
- text-align:left !important;
- color: #000000 !important;
- vertical-align: top !important;
-}
-TD {
- text-align:left !important;
- vertical-align: top !important;
-}
-TH.result {
- background-color: #999999 !important;
-}
-TD.result {
- background-color: #cccccc;
- vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_\Z_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_\Z_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_\Z_().toString()%>
- </TD>
- </TR>
- <TR>
- <TH>TEST2_</TH>
- <TD>
-
- <%=selColBeanRow12Bean.getTEST2_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_().toString()%>
- </TD>
- </TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cfad..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652ab..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 88dbd6f45..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次:<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e304..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
deleted file mode 100644
index f9a22b49b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html" %>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f15..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff9c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 76569028b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f50..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a0802..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
deleted file mode 100644
index b1cb042be..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981c0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"
-
-encoding="ISO-8859-3"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f49..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684f9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958c4..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" abcd="efc"
-
-encoding="ISO-8859-1"
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a4a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901e1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b73..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c1804..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a77..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3bcc..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636fca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c89..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850f8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e81783..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e691612..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d94..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc37..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.classpath b/tests/org.eclipse.jst.jsp.ui.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore b/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
deleted file mode 100644
index 3a5e93254..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-org.eclipse.jst.jsp.ui.tests_1.0.0.jar
-jspuitests.jar
-temp.folder
-PerformanceResults
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.project b/tests/org.eclipse.jst.jsp.ui.tests/.project
deleted file mode 100644
index 71a50f1c0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsp.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cf1194c6f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,48 +0,0 @@
-#Wed Jan 12 16:47:06 EST 2005
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-eclipse.preferences.version=1
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 9d57da3dd..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri May 27 23:39:13 EDT 2005
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b8b5336c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Structured Source Editor for JSP Tests
-Bundle-SymbolicName: org.eclipse.jst.jsp.ui.tests; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: jspuitests.jar
-Bundle-Activator: org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.ui.tests,
- org.eclipse.jst.jsp.ui.tests.contentassist,
- org.eclipse.jst.jsp.ui.tests.contentassist.testfiles,
- org.eclipse.jst.jsp.ui.tests.document,
- org.eclipse.jst.jsp.ui.tests.examples,
- org.eclipse.jst.jsp.ui.tests.model,
- org.eclipse.jst.jsp.ui.tests.modelquery,
- org.eclipse.jst.jsp.ui.tests.other,
- org.eclipse.jst.jsp.ui.tests.pagedirective,
- org.eclipse.jst.jsp.ui.tests.partitioning,
- org.eclipse.jst.jsp.ui.tests.partitioning.testfiles.jsp,
- org.eclipse.jst.jsp.ui.tests.registry,
- org.eclipse.jst.jsp.ui.tests.search,
- org.eclipse.jst.jsp.ui.tests.util,
- org.eclipse.jst.jsp.ui.tests.viewer
-Require-Bundle: org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jst.jsp.ui,
- org.junit,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.html.core,
- org.eclipse.wst.css.core,
- org.eclipse.ui.views,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.html.ui
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/about.html b/tests/org.eclipse.jst.jsp.ui.tests/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/build.properties b/tests/org.eclipse.jst.jsp.ui.tests/build.properties
deleted file mode 100644
index 771a50e96..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- PerformanceResults/,\
- testfiles.zip,\
- test.xml,\
- projecttestfiles/,\
- testfiles/,\
- jspuitests.jar,\
- META-INF/,\
- about.html
-jars.compile.order = jspuitests.jar
-source.jspuitests.jar = src/
-output.jspuitests.jar = bin/
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb858..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml b/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
deleted file mode 100644
index 93adf9fea..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension point="org.eclipse.ui.views">
- <view
- name="Embedded JSP Structured Text Viewer"
- icon="icons/sourceEditor.gif"
- category="org.eclipse.wst.sse.ui.tests"
- class="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP"
- id="org.eclipse.jst.jsp.ui.tests.viewer.ViewerTestJSP" />
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
deleted file mode 100644
index c50a9a9a6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/beaninfo_tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
deleted file mode 100644
index 32204f27b..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/includes_tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip b/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
deleted file mode 100644
index 773a303cc..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/projecttestfiles/jspsearch_tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
deleted file mode 100644
index 12156c76e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUIPreferencesTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.internal.preferences.JSPUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the JSP Source
- * editor preferences. Tests include setting/getting preferences.
- *
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class JSPUIPreferencesTest extends TestCase {
- /**
- * Tests existance of preference values when getting preference values
- * through Platform.getPreferencesService()
- */
- public void testBundleGetPreferences() {
- final String bundleName = "org.eclipse.wst.html.ui";
-
- // need to start up bundle for default values to be loaded
- Bundle bundle = Platform.getBundle(bundleName);
- try {
- if (bundle != null)
- bundle.start();
- else
- fail("Get preference value failed because could not find bundle: " + bundleName);
- } catch (BundleException e) {
- fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
- }
-
- bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE);
- bundleGetPreference(bundleName, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
- }
-
- private void bundleGetPreference(String bundleName, String prefKey) {
- String defaultValue = Long.toString(System.currentTimeMillis()); // random
- // string
-
- String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
- assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue, value);
- }
-
- /**
- * Tests default values of preferences.
- *
- * NOTE: Expected default values are hard-coded, so if default values do
- * get changed, assertions need to be updated as well
- */
- public void testPluginGetDefaultPreferences() {
- IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
- pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
- pluginGetDefaultPreference(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE, "<");
- }
-
- private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
- String defaultValue = store.getDefaultString(prefKey);
- assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
- }
-
- /**
- * Tests setting preference values by setting preference value to be a
- * certain value, then getting the preference value to verify it was set.
- */
- public void testPluginSetPreferences() {
- IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore();
-
- pluginSetPreferenceBoolean(store, JSPUIPreferenceNames.AUTO_PROPOSE);
- pluginSetPreferenceString(store, JSPUIPreferenceNames.AUTO_PROPOSE_CODE);
- }
-
- private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
- boolean originalValue = store.getBoolean(prefKey);
- boolean expectedValue = !originalValue;
- store.setValue(prefKey, expectedValue);
- boolean foundValue = store.getBoolean(prefKey);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- store.setValue(prefKey, originalValue);
- }
-
- private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
- String originalValue = store.getString(prefKey);
- String expectedValue = Long.toString(System.currentTimeMillis()); // random
- // string
- store.setValue(prefKey, expectedValue);
- String foundValue = store.getString(prefKey);
- assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + " expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
- // attempt to restore original preference value
- store.setValue(prefKey, originalValue);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
deleted file mode 100644
index 5b41a17a2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestSuite.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.contentassist.BeanInfoProviderTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPJavaTranslatorTest;
-import org.eclipse.jst.jsp.ui.tests.contentassist.JSPTranslationTest;
-import org.eclipse.jst.jsp.ui.tests.contentdescription.TestContentDescription;
-import org.eclipse.jst.jsp.ui.tests.document.FileBufferDocumentTester;
-import org.eclipse.jst.jsp.ui.tests.model.TestModelsFromFiles;
-import org.eclipse.jst.jsp.ui.tests.modelquery.ModelQueryTester;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.other.UnitTests;
-import org.eclipse.jst.jsp.ui.tests.pagedirective.TestPageDirective;
-import org.eclipse.jst.jsp.ui.tests.partitioning.TestStructuredPartitionerJSP;
-import org.eclipse.jst.jsp.ui.tests.registry.AdapterFactoryRegistryTest;
-import org.eclipse.jst.jsp.ui.tests.viewer.TestViewerConfigurationJSP;
-
-
-
-
-public class JSPUITestSuite extends TestSuite {
- public static Test suite() {
- return new JSPUITestSuite();
- }
-
- public JSPUITestSuite() {
- super("SSE JSP UI Test Suite");
-
- addTest(new TestSuite(ScannerUnitTests.class, "ScannerUnitTests"));
- addTest(new TestSuite(UnitTests.class, "UnitTests"));
- addTest(new TestSuite(TestStructuredPartitionerJSP.class, "TestStructuredPartioner"));
- addTest(new TestSuite(ModelQueryTester.class, "ModelQueryTester"));
- addTest(new TestSuite(JSPJavaTranslatorTest.class, "JSPJavaTranslatorTest"));
- addTest(new TestSuite(TestEmailNotice.class, "TestEmailNotice"));
- addTest(new TestSuite(BeanInfoProviderTest.class, "BeanInfoProviderTest"));
- addTest(new TestSuite(JSPTranslationTest.class, "JSPTranslationTest"));
- addTest(new TestSuite(AdapterFactoryRegistryTest.class, "AdapterFactoryRegistryText"));
- addTest(new TestSuite(JSPUIPreferencesTest.class));
- addTest(new TestSuite(TestViewerConfigurationJSP.class));
- addTest(new TestSuite(TestEditorConfigurationJSP.class));
-
- // moved from jsp core tests because they require UI
- addTest(new TestSuite(TestPageDirective.class));
- addTest(new TestSuite(FileBufferDocumentTester.class));
- addTest(new TestSuite(TestModelClone.class));
-
- addTest(new TestSuite(TestModelsFromFiles.class, "TestModelsFromFiles"));
- addTest(new TestSuite(TestModelEmbeddedContentType.class, "TestModelEmbeddedContentType"));
-
- addTest(new TestSuite(TestContentDescription.class, "Content Description Tests"));
- // pa_TODO fix this test
- //addTest(new TestSuite(JSPSearchTests.class));
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
deleted file mode 100644
index 13f504ab8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/JSPUITestsPlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPUITestsPlugin extends Plugin {
- //The shared instance.
- private static JSPUITestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- public static final String ID = "org.eclipse.jst.jsp.ui.tests";
-
- /**
- * The constructor.
- */
- public JSPUITestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.ui.tests.SSEForJSPTestsPluginResources");
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSPUITestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPUITestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static URL getInstallLocation() {
- URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.ui.tests").getEntry("/");
- URL resolvedLocation = null;
- try {
- resolvedLocation = Platform.resolve(installLocation);
- }
- catch (IOException e) {
- // impossible
- throw new Error(e);
- }
- return resolvedLocation;
- }
-
- public static File getTestFile(String filepath) {
- URL installURL = getInstallLocation();
- //String scheme = installURL.getProtocol();
- String path = installURL.getPath();
- String location = path + filepath;
- File result = new File(location);
- return result;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
deleted file mode 100644
index 44de87258..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.jst.jsp.ui.tests"; //$NON-NLS-1$
-
- private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
- public static final int OK = IStatus.OK; // 0
- public static final int INFO = IStatus.INFO; // 1
- public static final int WARNING = IStatus.WARNING; // 2
- public static final int ERROR = IStatus.ERROR; // 4
-
- public static final int OK_DEBUG = 200 + OK;
- public static final int INFO_DEBUG = 200 + INFO;
- public static final int WARNING_DEBUG = 200 + WARNING;
- public static final int ERROR_DEBUG = 200 + ERROR;
-
- /**
- * Adds message to log.
- * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
- * @param message text to add to the log
- * @param exception exception thrown
- */
- protected static void _log(int level, String message, Throwable exception) {
- if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
- if (!isDebugging())
- return;
- }
-
- int severity = IStatus.OK;
- switch (level) {
- case INFO_DEBUG :
- case INFO :
- severity = IStatus.INFO;
- break;
- case WARNING_DEBUG :
- case WARNING :
- severity = IStatus.WARNING;
- break;
- case ERROR_DEBUG :
- case ERROR :
- severity = IStatus.ERROR;
- }
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Prints message to log if category matches /debug/tracefilter option.
- * @param message text to print
- * @param category category of the message, to be compared with /debug/tracefilter
- */
- protected static void _trace(String category, String message, Throwable exception) {
- if (isTracing(category)) {
- message = (message != null) ? message : "null"; //$NON-NLS-1$
- Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
- }
-
- /**
- * @return true if the platform is debugging
- */
- public static boolean isDebugging() {
- return Platform.inDebugMode();
- }
-
- /**
- * Determines if currently tracing a category
- * @param category
- * @return true if tracing category, false otherwise
- */
- public static boolean isTracing(String category) {
- if (!isDebugging())
- return false;
-
- String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
- if (traceFilter != null) {
- StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- String cat = tokenizer.nextToken().trim();
- if (category.equals(cat)) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- public static void logException(String message, Throwable exception) {
- _log(ERROR, message, exception);
- }
-
- public static void logException(Throwable exception) {
- _log(ERROR, exception.getMessage(), exception);
- }
-
- public static void traceException(String category, String message, Throwable exception) {
- _trace(category, message, exception);
- }
-
- public static void traceException(String category, Throwable exception) {
- _trace(category, exception.getMessage(), exception);
- }
-
- public static void trace(String category, String message) {
- _trace(category, message, null);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java
deleted file mode 100644
index ece48bc72..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEditorConfigurationJSP.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- */
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.jst.jsp.ui.views.contentoutline.JSPContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for jsp content type
- */
-public class TestEditorConfigurationJSP extends TestCase {
- public void testGetSourceViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
- assertNotNull("no source viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
- // check for over-qualified subclasses
- assertEquals("unexpected source viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), StructuredTextViewerConfigurationJSP.class);
- }
-
- public void testGetContentOutlineViewerConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
- assertNotNull("no content outline viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
- // check for over-qualified subclasses
- assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), JSPContentOutlineConfiguration.class);
- }
-
- public void testGetPropertySheetConfiguration() {
- Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForJSP.ContentTypeID_JSP);
- assertNotNull("no property sheet configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o);
- // check for over-qualified subclasses
- assertEquals("unexpected property sheet configuration for " + ContentTypeIdForJSP.ContentTypeID_JSP, o.getClass(), XMLPropertySheetConfiguration.class);
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
deleted file mode 100644
index 154156da6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestEmailNotice.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import junit.framework.TestCase;
-
-public class TestEmailNotice extends TestCase {
- private boolean sendNotifications = false;
-
- public TestEmailNotice() {
- super();
- }
-
- public TestEmailNotice(String name) {
- super(name);
- }
-
- public void testEmail() {
- assertFalse("Simple test to be sure email gets sent on failure", sendNotifications);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
deleted file mode 100644
index 68bb8a904..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelClone.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.modelhandler.EmbeddedHTML;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-/**
- *
- */
-public class TestModelClone extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestModelClone(String name) {
- super(name);
- }
-
- public static Test getTest() {
- return new TestModelClone("testCreateStructuredModelJSP");
- }
-
- public void testCloneStructuredModelXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- assertTrue("model could not be created!", model != null);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- // if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
- // if (clonedModel.getParser() == model.getParser()) passed = false;
- // if (clonedModel.getReParser() == model.getReParser()) passed = false;
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- public void testCloneStructuredModelHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- assertTrue("model could not be created!", model != null);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are NOT identical, but that new instances
- // have been made
- boolean passed = true;
- // if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
- // if (clonedModel.getParser() == model.getParser()) passed = false;
- // if (clonedModel.getReParser() == model.getReParser()) passed = false;
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- public void testCloneStructuredModelJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the embedded type is correct
- boolean passed = true;
- Document doc = ((IDOMModel) clonedModel).getDocument();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
- assertNotNull("cloned model did not have embedded adapter", pageDirectiveAdapter);
-
- EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
- assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
- // if (clonedModel.getEncodingMemento() == model.getEncodingMemento()) passed = false;
- // if (clonedModel.getParser() == model.getParser()) passed = false;
- // if (clonedModel.getReParser() == model.getReParser()) passed = false;
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
- public void testCloneStructuredModelJSPXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
- // note, we initialy expect HTML, since there is not content
- checkEmbeddedType(model, EmbeddedHTML.class);
-
- String testContent = "<%@ page contentType=\"text/xml\" %>";
- model.getStructuredDocument().setText(this, testContent);
-
- // modified for design change, where re-init should be handled before
- // set returns.
- assertTrue("model should not need reinit", !model.isReinitializationNeeded());
-
- // but if it did need re-init, here's the right calling sequence
- // if (model.isReinitializationNeeded()) {
- // model.aboutToChangeModel();
- // model = model.reinit();
- // model.changedModel();
- // }
-
- checkEmbeddedType(model, EmbeddedXML.class);
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- checkEmbeddedType(clonedModel, EmbeddedXML.class);
-
- }
-
- private void checkEmbeddedType(IStructuredModel model, Class expectedType) {
- Document doc = ((IDOMModel) model).getDocument();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
- assertNotNull("model did not have embedded adapter", pageDirectiveAdapter);
-
- EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
- assertNotNull("model did not have embedded handler", embeddedHandler);
-
- assertEquals(expectedType, embeddedHandler.getClass());
-
- }
-
- public void testCreateStructuredModelJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
- factories = (ArrayList) factories.clone();
-
- IStructuredModel clonedModel = model.newInstance();
- if (model.getModelHandler() == null) {
- System.out.println();
- assertTrue(false);
- }
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are correct.
-
- ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- newFactories = (ArrayList) newFactories.clone();
-
- boolean passed = checkFactoriesListForIdentity(factories, newFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- passed = checkForSameEmbeddedFactories(model, clonedModel);
- assertTrue("newInstance of structured model is not correct", passed);
-
- // Now, assigning some content shouldn't change the factories
- clonedModel.getStructuredDocument().replaceText(this, 0, 0, "<sample> text");
- ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- twoFactories = (ArrayList) twoFactories.clone();
-
- passed = checkFactoriesListForIdentity(factories, twoFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- passed = checkForSameEmbeddedFactories(model, clonedModel);
- assertTrue("newInstance of structured model is not correct", passed);
-
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- clonedModel.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\"");
- ArrayList threeFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- threeFactories = (ArrayList) threeFactories.clone();
-
- passed = checkFactoriesListForIdentity(factories, threeFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- passed = checkForSameEmbeddedFactories(model, clonedModel);
- assertTrue("newInstance of structured model is not correct", passed);
-
-
- }
-
- /**
- * Method checkEmbeddedFactories.
- * @param model
- * @param clonedModel
- * @return boolean
- */
- private boolean checkForSameEmbeddedFactories(IStructuredModel model, IStructuredModel clonedModel) {
- boolean result = true;
-
-
- EmbeddedTypeHandler oldEmbeddedType = getEmbeddedType(model);
- EmbeddedTypeHandler newEmbeddedType = getEmbeddedType(clonedModel);
- // expect to be the same type
- if (!oldEmbeddedType.getClass().equals(newEmbeddedType.getClass())) {
- result = false;
- assertTrue(result);
- }
-
- List oldFactories = oldEmbeddedType.getAdapterFactories();
- List newFactories = newEmbeddedType.getAdapterFactories();
- result = checkFactoriesListForEquivalence(oldFactories, newFactories);
-
-
- return result;
- }
-
- private EmbeddedTypeHandler getEmbeddedType(IStructuredModel model) {
- Document doc = ((IDOMModel) model).getDocument();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getExistingAdapter(PageDirectiveAdapter.class);
- assertNotNull("model did not have embedded adapter", pageDirectiveAdapter);
-
- EmbeddedTypeHandler embeddedHandler = pageDirectiveAdapter.getEmbeddedType();
- assertNotNull("model did not have embedded handler", embeddedHandler);
-
- return embeddedHandler;
- }
-
-
- /**
- * Method checkFactoriesList.
- * @param factories
- * @param newFactories
- * @return boolean
- */
- private boolean checkFactoriesListForIdentity(List factories, List newFactories) {
- boolean result = true;
- if (factories.size() != newFactories.size()) {
- result = false;
- }
- else {
- // nned not be identical, nor same order
- // for (int i = 0; i < factories.size(); i++) {
- // if (!(factories.get(i) == newFactories.get(i))) {
- // result = false;
- // break;
- // }
- // }
- }
- return result;
- }
-
- private boolean checkFactoriesListForEquivalence(List factories, List newFactories) {
- boolean result = true;
- if (factories.size() != newFactories.size()) {
- result = false;
- }
- else {
- for (int i = 0; i < factories.size(); i++) {
- if (!factories.get(i).getClass().equals(newFactories.get(i).getClass())) {
- result = false;
- break;
- }
- }
- }
- return result;
- }
-
-
- public void testCreateStructuredModelHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- assertTrue("model could not be created!", model != null);
-
- ArrayList factories = (ArrayList) model.getFactoryRegistry().getFactories();
- factories = (ArrayList) factories.clone();
-
- IStructuredModel clonedModel = model.newInstance();
- assertTrue("cloned model could not be created!", clonedModel != null);
- // make sure the critical variables are correct.
-
- ArrayList newFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- newFactories = (ArrayList) newFactories.clone();
-
- boolean passed = checkFactoriesListForIdentity(factories, newFactories);
-
- assertTrue("newInstance of structured model is not correct", passed);
-
- // Now, assigning some content shouldn't change the factories
- clonedModel.getStructuredDocument().setText(this, "<sample> text");
- ArrayList twoFactories = (ArrayList) clonedModel.getFactoryRegistry().getFactories();
- twoFactories = (ArrayList) twoFactories.clone();
-
- passed = checkFactoriesListForIdentity(factories, newFactories);
- assertTrue("newInstance of structured model is not correct", passed);
-
- }
-
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
deleted file mode 100644
index 5751c4ee4..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/TestModelEmbeddedContentType.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerUtility;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-public class TestModelEmbeddedContentType extends TestCase {
-
- /**
- * Constructor for TestModelClone.
- */
- public TestModelEmbeddedContentType(String name) {
- super(name);
- }
-
- public static void main(String[] args) {
- }
-
- public static Test getTest() {
- return new TestModelEmbeddedContentType("testStructuredModelEmbeddedJSPChange");
- }
-
- protected void checkEmbeddedType(IStructuredModel clonedModel, Object expectedType) {
- Document doc = ((IDOMModel) clonedModel).getDocument();
- PageDirectiveAdapter embeddedTypeAdapter = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
- assertNotNull("cloned model did not have embedded adapter", embeddedTypeAdapter);
-
- EmbeddedTypeHandler embeddedHandler = embeddedTypeAdapter.getEmbeddedType();
- assertNotNull("cloned model did not have embedded handler", embeddedHandler);
-
- assertTrue("cloned model embeddedHandler is wrong type", embeddedHandler.equals(expectedType));
- }
-
- public void testStructuredModelEmbeddedXML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
- assertTrue("model could not be created!", model != null);
-
- // XML should NOT have an embedded type
- Document doc = ((IDOMModel) model).getDocument();
- EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
- assertTrue("embededHanlder should be null for XML", embeddedHandler == null);
-
- }
-
- public void testStructuredModelEmbeddedHTML() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
- assertTrue("model could not be created!", model != null);
-
- // should NOT have an embedded type
- Document doc = ((IDOMModel) model).getDocument();
- EmbeddedTypeHandler embeddedHandler = (EmbeddedTypeHandler) ((INodeNotifier) doc).getAdapterFor(EmbeddedTypeHandler.class);
- assertTrue("embededHanlder should be null for HTML", embeddedHandler == null);
-
- }
-
- protected IStructuredModel doStructuredModelEmbeddedJSP() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // should have an embedded type
- Document doc = ((IDOMModel) model).getDocument();
- PageDirectiveAdapter embeddedHandler = (PageDirectiveAdapter) ((INodeNotifier) doc).getAdapterFor(PageDirectiveAdapter.class);
- assertTrue("embededHanlder should NOT be null for JSP", embeddedHandler != null);
-
- // embedded type should be HTML since no content
- checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
- String testContent = "<%@ page contentType=\"text/html\" %>";
- model.getStructuredDocument().replaceText(this, 0, 0, testContent);
- assertTrue("reinit should NOT be needed in this case", !model.isReinitializationNeeded());
-
- // embedded type should STILL be HTML since no contentType was
- // text/html
- checkEmbeddedType(model, ModelHandlerUtility.getDefaultEmbeddedType());
-
- return model;
- //
- }
-
- public void testStructuredModelEmbeddedJSP() throws IOException {
- doStructuredModelEmbeddedJSP();
- }
-
- public void testStructuredModelEmbeddedJSPChange() throws IOException {
-
- // start with the full test case
- IStructuredModel model = doStructuredModelEmbeddedJSP();
- // change "html" to "xml"
- model.getStructuredDocument().replaceText(this, 27, 4, "xml");
- // with reinit in XML model ... its already been re-initialized
- // assertTrue("reinit SHOULD be needed in this case",
- // model.isReiniitializationNeeded());
-
- if (model.isReinitializationNeeded()) {
- model.reinit();
- }
-
- // embedded type should now be XML
- checkEmbeddedType(model, ModelHandlerUtility.getEmbeddedContentTypeFor("text/xml"));
-
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
deleted file mode 100644
index d5dca88c1..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/BeanInfoProviderTest.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.ui.internal.contentassist.BeanInfoProvider;
-import org.eclipse.jst.jsp.ui.internal.contentassist.IJavaPropertyDescriptor;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-
-/**
- * This class tests the BeanInfoProvider. Currently test workspace MUST point
- * to the specific one for this test.
- *
- * @author pavery
- */
-public class BeanInfoProviderTest extends TestCase {
- class OverwriteNone implements IOverwriteQuery {
- public String queryOverwrite(String pathString) {
- return IOverwriteQuery.ALL;
- }
- }
-
- private IResource fResource;
- private BeanInfoProvider fProvider;
- private HashSet fAlreadyOpen = new HashSet();
- private ProjectUnzipUtility fProjUtil = null;
- private boolean fIsSetup = false;
-
- public BeanInfoProviderTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.fIsSetup) {
- initializeResource();
- this.fIsSetup = true;
- }
- }
-
- private void initializeResource() throws Exception {
- fProjUtil = new ProjectUnzipUtility();
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
- // platform location may be null -- depends on "mode" of platform
- if (platformLocation != null) {
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "beaninfo_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
- fProjUtil.initJavaProject("BEANINFO");
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String workspaceRelativeLocation = "/BEANINFO/BEAN_TESTS/beanInfo_test.jsp";
- fResource = root.getFile(new Path(workspaceRelativeLocation));
- IJavaProject javaProj = JavaCore.create(fResource.getProject());
- openPath(javaProj);
- }
- }
-
- protected File getSourceDirectory(String absoluteSourceDirectoryPath) {
- File sourceDirectory = new File(absoluteSourceDirectoryPath);
- if (!sourceDirectory.exists() || !sourceDirectory.isDirectory()) {
- return null;
- }
- return sourceDirectory;
- }
-
- private void openPath(IJavaProject javaProj) {
- try {
- if (javaProj.exists() && !javaProj.isOpen()) {
- javaProj.open(null);
- }
- IPackageFragmentRoot root = javaProj.getPackageFragmentRoot(fResource.getProject());
- if (!root.isOpen())
- root.open(null);
- IPackageFragment frag = getPackageFragment(root, "BEAN_TESTS");
- openAll(frag);
- frag = getPackageFragment(root, "org");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst.jsp");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst.jsp.ui");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- frag = getPackageFragment(root, "org.eclipse.jst.jsp.ui.tests");
- if (frag != null && !frag.isOpen())
- openAll(frag);
- }
- catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
-
- private IPackageFragment getPackageFragment(IPackageFragmentRoot root, String fragmentName) throws JavaModelException {
- IPackageFragment frag = null;
- IJavaElement[] children = root.getChildren();
- for (int i = 0; i < children.length; i++) {
- if (children[i].getElementName().equals(fragmentName)) {
- frag = (IPackageFragment) children[i];
- break;
- }
- }
- return frag;
- }
-
- private void openAll(IJavaElement javaElem) throws JavaModelException {
- if (javaElem instanceof IOpenable) {
- if (!((IOpenable) javaElem).isOpen())
- ((IOpenable) javaElem).open(null);
- }
- if (javaElem instanceof IParent && ((IParent) javaElem).hasChildren()) {
- IJavaElement[] children = ((IParent) javaElem).getChildren();
- for (int i = 0; i < children.length; i++) {
- if (!fAlreadyOpen.contains(children[i].getElementName())) {
- fAlreadyOpen.add(children[i].getElementName());
- openAll(children[i]);
- }
- }
- }
- }
-
- public void testAll() {
- beanOnClasspath();
- beanInProject();
- }
-
- private void beanOnClasspath() {
- // pa_TODO don't use JButton, properties change
- // use something more static
- IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "javax.swing.JButton");
- // assertEquals("Number of properties for JButton:", 122, descriptors.length);
- assertNotNull("descriptors shouldn't be null", descriptors);
-
- // List getOnly = new ArrayList();
- // List setOnly = new ArrayList();
- // List both = new ArrayList();
- // IJavaPropertyDescriptor jpd = null;
- // for (int i = 0; i < descriptors.length; i++) {
- // jpd = descriptors[i];
- // if (jpd.getReadable() && jpd.getWriteable())
- // both.add(jpd);
- // else if (jpd.getReadable() && !jpd.getWriteable())
- // getOnly.add(jpd);
- // else
- // setOnly.add(jpd);
- // }
- // assertEquals("Number of getOnly properties:", 62, getOnly.size());
- //assertEquals("Number of setOnly properties:", 0, setOnly.size());
- //assertEquals("Number of get & set properties that:", 59,
- // both.size());
- }
-
- private void beanInProject() {
- IJavaPropertyDescriptor[] descriptors = getProvider().getRuntimeProperties(fResource, "org.eclipse.jst.jsp.ui.tests.BaseAlbumCollectionBean");
- assertEquals("Number of properties for BaseAlbumCollectionBean:", 4, descriptors.length);
- List getOnly = new ArrayList();
- List setOnly = new ArrayList();
- List both = new ArrayList();
- IJavaPropertyDescriptor jpd = null;
- for (int i = 0; i < descriptors.length; i++) {
- jpd = descriptors[i];
- if (jpd.getReadable() && jpd.getWriteable())
- both.add(jpd);
- else if (jpd.getReadable() && !jpd.getWriteable())
- getOnly.add(jpd);
- else
- setOnly.add(jpd);
- }
- assertEquals("Number of getOnly properties:", 1, getOnly.size());
- assertEquals("Number of setOnly properties:", 1, setOnly.size());
- assertEquals("Number of get & set properties that:", 2, both.size());
- // get only
- jpd = (IJavaPropertyDescriptor) getOnly.get(0);
- assertEquals("get readable for get only property: ", true, jpd.getReadable());
- assertEquals("get writable for get only property:", false, jpd.getWriteable());
- assertEquals("name for get only property", "numCds", jpd.getDisplayName());
- assertEquals("type for get only property", "int", jpd.getDeclaredType());
- // set only
- jpd = (IJavaPropertyDescriptor) setOnly.get(0);
- assertEquals("get readable for set only property: ", false, jpd.getReadable());
- assertEquals("get writable for set only property:", true, jpd.getWriteable());
- assertEquals("name for set only property", "cds", jpd.getDisplayName());
- assertEquals("type for set only property", "String[]", jpd.getDeclaredType());
- // both
- jpd = (IJavaPropertyDescriptor) both.get(0);
- assertEquals("get readable for both property: ", true, jpd.getReadable());
- assertEquals("get writable for both property:", true, jpd.getWriteable());
- }
-
- private BeanInfoProvider getProvider() {
- if (fProvider == null)
- fProvider = new BeanInfoProvider();
- return fProvider;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
deleted file mode 100644
index 4b165d7c2..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPJavaTranslatorTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentassist;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslator;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * This class tests the sed JSPJavaTranslator class
- * @author pavery
- */
-public class JSPJavaTranslatorTest extends TestCase {
-
- public JSPJavaTranslatorTest(String name) {
- super(name);
- }
-
- public void testAllFiles() {
- // this test is for PMR: 91930 CMVC:218469
- testJSPInJavascript("testfiles/jspInJavascript.jsp");
- }
-
- public void testJSPInJavascript(String filename) {
- IStructuredModel sm = getStructuredModelForRead(filename);
- if (sm != null) {
- IDOMNode xmlNode = (IDOMNode) sm.getIndexedRegion(0);
-
- if (xmlNode != null) {
- JSPTranslator jspt = new JSPTranslator();
- jspt.reset(xmlNode, null);
- //int sourceTextPos = text.indexOf("<%= testJspString") + 17;
- //jspt.setSourceCursor(sourceTextPos); // right after the text
- jspt.translate();
- String translation = jspt.getTranslation().toString();
- // offsets are found using JSPTranslation now
- //int translatedCursorPosition = jspt.getCursorPosition();
- //assertEquals("incorrect cursor position >" + translatedCursorPosition, 519, translatedCursorPosition);
- //assertEquals("translation was incorrect", "testJspString", translation.substring(519, 532));
- int cursorStart = translation.indexOf("out.print(\"\"+\n testJspString") + 14;
- assertEquals("incorrect cursor position >" + cursorStart, 667, cursorStart);
- }
- sm.releaseFromRead();
- }
- }
-
- /**
- * IMPORTANT whoever calls this must releaseFromRead after they are done using it.
- * @param filename
- * @return
- */
- protected IStructuredModel getStructuredModelForRead(String filename) {
- try {
- // create model
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel sModel = modelManager.getModelForRead(filename, inStream, null);
- return sModel;
- }
- catch (IOException ioex) {
- System.out.println("couldn't open file > " + filename);
- }
- return null;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
deleted file mode 100644
index b54a28ad7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/JSPTranslationTest.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentassist;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jst.jsp.core.internal.domdocument.DOMModelForJSP;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.ui.tests.other.ScannerUnitTests;
-import org.eclipse.jst.jsp.ui.tests.util.FileUtil;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * This class unit tests the sed JSPTranslation mechanism.
- * That includes JSPTranslationAdapterFactory, JSPTranslationAdapter, and JSPTranslation.
- * It uses the jsp_include_test.jsp, because of the more complicated translation and offsets.
- *
- * @author pavery
- */
-public class JSPTranslationTest extends TestCase {
-
- private ProjectUnzipUtility fProjUtil = null;
- private boolean isSetup = false;
-
- private HashMap fXMLJSPPositions;
-
- public JSPTranslationTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if (!this.isSetup) {
- doSetup();
- this.isSetup = true;
- }
- }
-
- private void doSetup() throws Exception {
- fProjUtil = new ProjectUnzipUtility();
-
- // root of workspace directory
- Location platformLocation = Platform.getInstanceLocation();
-
- File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, "includes_tests.zip", ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
- fProjUtil.unzipAndImport(zipFile, platformLocation.getURL().getPath());
- fProjUtil.initJavaProject("INCLUDES_TESTS");
- }
-
- public void testTranslatePositions() {
-
- IDOMModel model = getIncludeTestModelForRead();
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- try {
- HashMap java2jsp = translation.getJava2JspMap();
- assertEquals("java2jsp map size:", 13, java2jsp.size());
-
- HashMap jsp2java = translation.getJsp2JavaMap();
- assertEquals("jsp2java map size:", 3, jsp2java.size());
-
- // some test positions (out.print("" + | );)
-
- // we need to ignore the classname length in our comparisons
- // with java offsets that we get from the translation
- // since it can vary depending on workspace location
- int classnameLength = translation.getClassname().length();
-
- int jspTestPosition = translation.getJspText().indexOf("<%= ") + 4;
- int javaOffset = translation.getJavaOffset(jspTestPosition) - classnameLength;
- assertEquals("JSPTranslation java offset:", 1009, javaOffset);
-
- // (<%= | %>)
- int javaTestPostition = translation.getJavaText().indexOf("out.print(\"\"+\n \n);") + 14;
- // dont' need to worry about classname length here because we are comparing
- // with a position in the JSP document (which doesn't contain classname)
- int jspOffset = translation.getJspOffset(javaTestPostition);
- assertEquals("JSPTranslation jsp offset:", 564, jspOffset);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
-
- public void testJSPTranslationText() {
-
- IDOMModel model = getIncludeTestModelForRead();
- ScannerUnitTests.verifyLengths(model, model.getStructuredDocument().get());
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- // named as .bin so no line conversion occurs (\n is in use)
- InputStream in = getClass().getResourceAsStream("translated_text.bin");
- String knownTranslationText = loadChars(in);
- try {
- // improvements: may need finer tuned text compares later
- // for different types of translations (includes, xml-jsp in script, attributes, etc...)
- String text = translation.getJavaText();
-
- assertNotNull("JSP translation text:", text);
- assertEquals("JSP translation text does not match expected", knownTranslationText, text);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- public void testJSPTranslationAdapter() {
- IDOMModel model = getIncludeTestModelForRead();
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- try {
- IJavaProject proj = adapter.getJavaProject();
- assertNotNull("couldn't get java project:" + proj);
-
- translation = adapter.getJSPTranslation();
- assertNotNull("couldn't get translation:", translation);
- }
- finally {
- if (model != null)
- model.releaseFromRead();
- }
- }
-
- /**
- * Makes sure both beans are translated even though they are
- * right next to each other with no space.
- *
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=103004
- */
- public void testUseBeanNoSpace() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/useBean_tester.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
- String javaText = translation.getJavaText();
- boolean bean1 = javaText.indexOf("javax.swing.JButton x = null;") != -1;
- boolean bean2 = javaText.indexOf("javax.swing.JButton y = null;") != -1;
- assertTrue(bean1);
- assertTrue(bean2);
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- /**
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=86382
- */
- public void testXMLJSPTranslationText() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/xml-jsp/most-tags-xml-jsp.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- String javaText = translation.getJavaText();
-
- // named as .bin so no line conversion occurs (\n is in use)
- InputStream in = getClass().getResourceAsStream("translated_xml_jsp.bin");
- String knownTranslationText = loadChars(in);
-
- assertEquals(knownTranslationText, javaText);
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- public void testXMLJSPMapping() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/xml-jsp/most-tags-xml-jsp.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- HashMap jsp2java = translation.getJsp2JavaMap();
- Object[] jspRanges = jsp2java.keySet().toArray();
- Position jspPos = null;
- Position javaPos = null;
- for (int i = 0; i < jspRanges.length; i++) {
- jspPos = (Position)jspRanges[i];
- javaPos = (Position)jsp2java.get(jspPos);
- //System.out.println("jsp:" + printPos(jspPos) + " >> java:" + printPos(javaPos));
- checkPosition(jspPos, javaPos);
- }
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- public void testXMLJSPCDATAText() {
- IFile f = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("INCLUDES_TESTS/cdata/cdata.jsp"));
- DOMModelForJSP sModel = (DOMModelForJSP)getStructuredModelForRead(f);
- try {
- setupAdapterFactory(sModel);
- JSPTranslationAdapter adapter = (JSPTranslationAdapter) sModel.getDocument().getAdapterFor(IJSPTranslation.class);
- JSPTranslation translation = adapter.getJSPTranslation();
-
- String transText = translation.getJavaText();
-
-// named as .bin so no line conversion occurs (\n is in use)
- InputStream in = getClass().getResourceAsStream("translated_xml_jsp_cdata.bin");
- String knownText = loadChars(in);
-
- assertEquals(knownText, transText);
- }
- finally {
- if(sModel != null)
- sModel.releaseFromRead();
- }
- }
-
- private void checkPosition(Position jspPos, Position javaPos) {
-
- HashMap expected = getXMLJSPPositions();
- Object[] keys =expected.keySet().toArray();
- Position expectedJspPos= null;
- Position expectedJavaPos = null;
- boolean found = false;
- for (int i = 0; i < keys.length; i++) {
- expectedJspPos = (Position)keys[i];
- if(jspPos.equals(expectedJspPos)) {
- expectedJavaPos = (Position)expected.get(expectedJspPos);
- found = true;
- }
- }
- assertTrue("expected JSP position missing: " + jspPos, found);
- assertNotNull("no expected java position for jspPos: " + printPos(jspPos), expectedJavaPos);
- assertEquals("unexpected java position was:" + printPos(javaPos) + " but expected:" + printPos(expectedJavaPos), javaPos, expectedJavaPos);
- }
- private String printPos(Position pos) {
- return pos != null ? "[" + pos.offset +":"+ pos.length + "]" : "null";
- }
- private HashMap getXMLJSPPositions() {
- if(fXMLJSPPositions == null) {
- fXMLJSPPositions = new HashMap();
- fXMLJSPPositions.put(new Position(882,52), new Position(920,31));
- fXMLJSPPositions.put(new Position(961,7), new Position(952,7));
- fXMLJSPPositions.put(new Position(1018,14), new Position(89,14));
- fXMLJSPPositions.put(new Position(640,2), new Position(888,2));
- fXMLJSPPositions.put(new Position(406,24), new Position(759,24));
- fXMLJSPPositions.put(new Position(685,19), new Position(897,19));
- fXMLJSPPositions.put(new Position(650,26), new Position(861,26));
- fXMLJSPPositions.put(new Position(563,9), new Position(848,9));
- fXMLJSPPositions.put(new Position(461,23), new Position(784,23));
- fXMLJSPPositions.put(new Position(522,8), new Position(822,8));
- fXMLJSPPositions.put(new Position(323,44), new Position(274,45));
- fXMLJSPPositions.put(new Position(245,43), new Position(229,44));
- }
- return fXMLJSPPositions;
- }
-
- private static String loadChars(InputStream input) {
-
- StringBuffer s = new StringBuffer();
- try {
- int c = -1;
- while ((c = input.read()) >= 0) {
- if (c > 255)
- break;
- s.append((char) c);
- }
- input.close();
- }
- catch (IOException e) {
- System.out.println("An I/O error occured while loading :");
- System.out.println(e);
- }
- return s.toString();
- }
-
- /**
- * add the factory for JSPTranslationAdapter here
- * @param sm
- */
- private void setupAdapterFactory(IStructuredModel sm) {
- JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
- sm.getFactoryRegistry().addFactory(factory);
- }
-
- /**
- * IMPORTANT - release model (model.releaseFromRead()) after use
- * @param file
- * @return
- */
- private IStructuredModel getStructuredModelForRead(IFile file) {
- try {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- return modelManager.getModelForRead(file);
- }
- catch (IOException ioex) {
- System.out.println("couldn't open file > " + file);
- }
- catch (CoreException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- private IDOMModel getIncludeTestModelForRead() {
-
- IPath jspTestFilePath = new Path("INCLUDES_TESTS/jsp_include_test.jsp");
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(jspTestFilePath);
- IDOMModel xmlModel = (IDOMModel) getStructuredModelForRead(file);
- setupAdapterFactory(xmlModel);
- return xmlModel;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
deleted file mode 100644
index f8c7c028c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/testfiles/jspInJavascript.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>pmr.jsp</TITLE>
-
-<%!String testJspString = "testJspString"; %>
-<script>
-
-var test = <%= testJspString %>;
-
-</script>
-
-
-
-</HEAD>
-<BODY>
-<% %>
-<P>Place jspInJavascript.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
deleted file mode 100644
index d70436349..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_text.bin
+++ /dev/null
@@ -1,37 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_TESTS_2F_jsp_include_test_2E_jsp extends javax.servlet.http.HttpServlet{
- String argh = "argh";
-
- public String globalIncludedString = "included";
-
- protected String with_space = "withspace";
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.http.HttpSession session = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-
-try {
- String localIncludedString = globalIncludedString;
-for(int i=0; i<5; i++) {
-out.print(""+
-i
-);
-}
-javax.swing.JButton BEAN_includedBean = new javax.swing.JButton();
- int include_include_int = 5;
-javax.swing.JButton includesUseBean = new javax.swing.JButton();
-{ // <gifts:gift>
-} // </gifts:gift>
-out.print(""+
-
-);
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
deleted file mode 100644
index 4e46230a6..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp.bin
+++ /dev/null
@@ -1,33 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import java.util.List;
-public class __2F_INCLUDES_TESTS_2F_xml_2D_jsp_2F_most_2D_tags_2D_xml_2D_jsp_2E_jsp extends javax.servlet.http.HttpServlet{
-public String myFunc() { return "myfunc"; }
-
-public String myFunc2() { return "myfunc"; }
-
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.http.HttpSession session = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-
-try {
-String consec1 = "test";
-String consec2 = "two";
-out.print(""+
-myFunc()
-);
-out.print(""+
-myFunc2()
-);
-javax.swing.AbstractButton jb = new javax.swing.JButton();
-String includedString = "incd";
- jb.
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
deleted file mode 100644
index e045acc74..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/translated_xml_jsp_cdata.bin
+++ /dev/null
@@ -1,37 +0,0 @@
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-public class __2F_INCLUDES_TESTS_2F_cdata_2F_cdata_2E_jsp extends javax.servlet.http.HttpServlet{
-public void _jspService(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response)
- throws java.io.IOException, javax.servlet.ServletException {
-javax.servlet.jsp.PageContext pageContext = null;
-javax.servlet.http.HttpSession session = null;
-javax.servlet.ServletContext application = null;
-javax.servlet.ServletConfig config = null;
-javax.servlet.jsp.JspWriter out = null;
-Object page = null;
-
-try {
-
-int a = 1;
-if (a
-<
- 2) {
- out.println("x");
-}
-
-String test = "";
-
-
-
-int a = 1;
-if (a < 2) {
- out.println("x");
-}
-
-
-
- test.toUpperCase();
- } catch (java.lang.Exception e) {}
-}} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java
deleted file mode 100644
index ad4d1b481..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentdescription/TestContentDescription.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.contentdescription;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsp.core.internal.Logger;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-
-/**
- * Tests that our ContentDescriberForJSP is working as expected,
- * We check that the content description for a given input stream has all
- * of the appropriate properties.
- * (through the Platform content type framework)
- */
-public class TestContentDescription extends UnzippedProjectTester {
-
- public void testNoXMLPIWithJSPSyntax() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
- doTestContentDescription("/content-description/PurchaseOrder-no-XMLPI-jsp-syntax.jsp", expectedProperties);
- }
-
- public void testWithXMLPIWithJSPSyntax() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
- doTestContentDescription("/content-description/PurchaseOrder-with-XMLPI-jsp-syntax.jsp", expectedProperties);
- }
-
- public void testWithXMLPIWithXMLSyntax() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- expectedProperties.put(IContentDescription.CHARSET, "UTF-8");
- doTestContentDescription("/content-description/PurchaseOrder-with-XMLPI-xml-syntax.jsp", expectedProperties);
- }
-
- public void testJSPWithHTMLOutput() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/html");
- doTestContentDescription("/content-description/html.jsp", expectedProperties);
- }
-
- public void testJSPWithXHTMLOutput() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xhtml");
- doTestContentDescription("/content-description/xhtml.jsp", expectedProperties);
- }
-
- public void testJSPWithXMLOutput() {
- HashMap expectedProperties = new HashMap();
- expectedProperties.put(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE, "text/xml");
- doTestContentDescription("/content-description/xml.jsp", expectedProperties);
- }
-
- private void doTestContentDescription(String filePath, HashMap expectedProperties) {
- IContentDescription desc = getContentDescription(filePath);
- assertNotNull("couldn't get IContentDescription for file:[" + filePath + "]", desc);
- Object[] keys = expectedProperties.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
-
- Object expected = expectedProperties.get(keys[i]);
- Object detected = desc.getProperty( (QualifiedName)keys[i] );
- assertEquals("unexpected property value", expected, detected);
- }
- }
-
- private IContentDescription getContentDescription(String filePath) {
- if(filePath == null)
- return null;
-
- InputStream in = null;
- try {
- // workspace file
- IFile wsFile = FileBuffers.getWorkspaceFileAtLocation(new Path(filePath));
- if(wsFile != null && wsFile.exists()) {
- in = wsFile.getContents();
- }
- else {
- // external file
- File sFile = FileBuffers.getSystemFileAtLocation(new Path(filePath));
- if(sFile !=null && sFile.exists())
- in = new FileInputStream(sFile);
- }
- }
- catch (CoreException e) {
- Logger.logException(e);
- }
- catch (FileNotFoundException e) {
- Logger.logException(e);
- }
-
- assertNotNull(in);
-
- return getContentDescription(in);
- }
-
- /**
- * Returns content description for an input stream
- * Assumes it's JSP content.
- * Closes the input stream when finished.
- *
- * @param in
- * @return the IContentDescription for in
- */
- private IContentDescription getContentDescription(InputStream in) {
-
- if(in == null)
- return null;
-
- IContentDescription desc = null;
- try {
-
- IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
- desc = contentTypeJSP.getDescriptionFor(in, IContentDescription.ALL);
- }
- catch (IOException e) {
- Logger.logException(e);
- }
- finally {
- if(in != null) {
- try {
- in.close();
- }
- catch (IOException e) {
- Logger.logException(e);
- }
- }
- }
- return desc;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index d8e866bbb..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
- private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertNotNull("Test Case in error. Could not find file " + filePath, file);
- IPath locationPath = file.getLocation();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- bufferManager.connect(locationPath, null);
- ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
- IDocument document = buffer.getDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- bufferManager.disconnect(locationPath, null);
-
-// doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-
- }
-
- /**
- * @param file
- * @param expectedDocumentClass
- * @param expectedPartioner
- * @throws CoreException
- * @throws IOException
- */
-// private void doTestCreateWithFacade(IFile file, Class expectedDocumentClass, Class expectedPartioner) throws IOException, CoreException {
-// DocumentLoaderForXML documentLoaderForXML = new DocumentLoaderForXML();
-// IDocument document = documentLoaderForXML.createNewStructuredDocument(file, null);
-// assertNotNull(document);
-// }
-
- private void doTestCreateCreateEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException {
- IFile file = (IFile) fTestProject.findMember(filePath);
- assertTrue("Test Case in error. Non-existent file existed! " + filePath, file == null);
- IPath locationPath = new Path(filePath);
- IFile nonExistingFile = fTestProject.getFile(locationPath);
- locationPath = nonExistingFile.getFullPath();
- ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
- // can not "connect" to non-existant location
- //bufferManager.connect(locationPath, BasicStructuredDocument.class,
- // StructuredTextPartitionerForXML.class);
- IDocument document = bufferManager.createEmptyDocument(locationPath);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- assertTrue("wrong partitioner in document", expectedPartioner.isInstance(document.getDocumentPartitioner()));
- bufferManager.disconnect(locationPath, null);
-
- }
-
-/*
-
- public void testFile103() throws CoreException, IOException {
- doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile104() throws CoreException, IOException {
- doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile105() throws CoreException, IOException {
- doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile106() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile107() throws CoreException, IOException {
- doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile108() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile109() throws CoreException, IOException {
- doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile110() throws CoreException, IOException {
- doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile111() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile112() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile113() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile114() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile115() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile116() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile117() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile118() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile119() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile120() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile121() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile122() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile123() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile124() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile125() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile126() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile127() throws CoreException, IOException {
- doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testFile128() throws CoreException, IOException {
- doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXML() throws CoreException {
- doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleCase() throws CoreException, IOException {
- doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
-
- public void testFile1() throws CoreException, IOException {
- doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
- }
-
-*/
-
- public void testFile70() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile81() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile82() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile83() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile84() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile85() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile86() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile87() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile88() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile89() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile90() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile91() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile92() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile93() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile94() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile95() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile96() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile97() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile98() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile99() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile100() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile101() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile102() throws CoreException, IOException {
- doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-
- public void testFile71() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile72() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile73() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile74() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile75() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile76() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile77() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile78() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile79() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testFile80() throws CoreException, IOException {
- doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index 08f1fddb7..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jst.jsp.ui.tests.document;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.util.ProjectUnzipUtility;
-
-/**
- * @author pavery
- */
-public class UnzippedProjectTester extends TestCase {
-
- protected static IProject fTestProject;
- private static boolean fTestProjectInitialized;
- private static int nSetups = 0;
- private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
- protected void setUp() throws Exception {
- super.setUp();
- nSetups++;
- if (!fTestProjectInitialized) {
- getAndCreateProject();
- // unzip files to the root of workspace directory
- String destinationProjectString = fTestProject.getLocation().toOSString();
- String destinationFolder = destinationProjectString + "/";
- // this zip file is sitting in the "root" of test plugin
- File zipFile = JSPUITestsPlugin.getTestFile("testfiles.zip");
- ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- projUtil.unzipAndImport(zipFile, destinationFolder);
- projUtil.initJavaProject(TEST_PROJECT_NAME);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- fTestProjectInitialized = true;
- }
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- nSetups--;
- if (nSetups == 0) {
- if (!DEBUG) {
- // Display display = PlatformUI.getWorkbench().getDisplay();
- // display.asyncExec(new Runnable() {
- // public void run() {
- // ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
- // IProject proj = fTestProject;
- // fTestProject = null;
- // try {
- // projUtil.deleteProject(proj);
- // } catch (Exception e) {
- // e.printStackTrace();
- // }
- // }
- // });
- }
- }
- }
-
- private static final boolean DEBUG = false;
-
- private static void getAndCreateProject() throws CoreException {
- //TestsPlugin testsPlugin = (TestsPlugin)
- // Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
- IWorkspace workspace = getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- fTestProject = root.getProject(TEST_PROJECT_NAME);
- // this form creates project as "linked" back to 'fileRoot'
- //createProject(testProject, new Path(fileRoot), null);
- createProject(fTestProject, null, null);
- fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
- assertTrue(fTestProject.exists());
- // IContainer dotestFiles = testProject.getFolder("dotestFiles");
- // assertTrue(dotestFiles.exists());
- // IResource[] allFolders = dotestFiles.members();
- // assertNotNull(allFolders);
- }
-
- private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException {
- if (monitor == null) {
- monitor = new NullProgressMonitor();
- }
- monitor.beginTask("creating test project", 10);
- // create the project
- try {
- if (!project.exists()) {
- IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
- if (Platform.getLocation().equals(locationPath)) {
- locationPath = null;
- }
- desc.setLocation(locationPath);
- project.create(desc, monitor);
- monitor = null;
- }
- if (!project.isOpen()) {
- project.open(monitor);
- monitor = null;
- }
- }
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
deleted file mode 100644
index d41da590c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/examples/CreatingJSPExpression.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.examples;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.format.NodeFormatter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class CreatingJSPExpression extends TestCase {
-
- /**
- *
- */
- public CreatingJSPExpression() {
- super();
- }
-
- /**
- * @param name
- */
- public CreatingJSPExpression(String name) {
- super(name);
- }
-
- public void testCreateJSPExpression() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
-
- Document doc = ((IDOMModel) model).getDocument();
-
- Element jspexpression = doc.createElement("jsp:expression");
- ((IDOMElement) jspexpression).setJSPTag(true);
- doc.appendChild(jspexpression);
- Text javacode = doc.createTextNode(" // some java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
- jspexpression.appendChild(javacode);
-
-
- Text cdatasection = doc.createCDATASection(" // some cdata java code here; if (x <0) return new String(\"0\") else return new String (\"1\"); ");
- doc.appendChild(cdatasection);
-
- // format's not needed, just prettier ... not sure why
- // it won't work right on whole document.
- new NodeFormatter().format(jspexpression);
- new NodeFormatter().format(cdatasection);
- System.out.println("document text: ");
- System.out.println(model.getStructuredDocument().get());
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
deleted file mode 100644
index ea124229e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/model/TestModelsFromFiles.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.model;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jst.jsp.core.internal.text.StructuredTextPartitionerForJSP;
-import org.eclipse.jst.jsp.ui.tests.document.UnzippedProjectTester;
-import org.eclipse.wst.html.core.internal.text.StructuredTextPartitionerForHTML;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Utilities;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-public class TestModelsFromFiles extends UnzippedProjectTester {
- public void testNonExistentXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNonExistentDocument("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentXMLModel() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateModelWithNonExistIFile("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testNonExistentJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testNonExistentJSPDocument() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNonExistentDocument("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testNonExistentJSPModel() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreateModelWithNonExistIFile("testfiles/jsp/testnonexistent.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testSimpleCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmpty("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleDocumentCaseXML() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmptyDocument("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
- }
-
- public void testSimpleDocumentCaseJSP() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmptyDocument("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testComplexCase() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestNotEmpty("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testReload() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestReload("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testJSPWithXMLOutput() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestReload("testfiles/jsp/jsp-xml-output.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testXHTMLTransitional1() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xhtml/testx.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
- }
-
- public void testXHTMLTransitional2() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xhtml/testx.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- public void testXHTMLTransitional3() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/xhtml/testx.xhtml", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
- }
-
- public void testHTMLTransitional1() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/html/testh.html", BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class);
- }
-
- public void testHTMLTransitional2() throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- doTestCreate("testfiles/html/testh.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
- }
-
- /*
- * TODO: these test files are missing, for some reason when running on
- * build machine ... need to re-construct public void testNearEmptyJSP()
- * throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- * doTestNotEmpty("testfiles/jsp/nearEmpty.jsp",
- * BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class); }
- *
- * public void testNearEmptyXML() throws ResourceAlreadyExists,
- * ResourceInUse, IOException, CoreException {
- * doTestNotEmpty("testfiles/xml/nearEmpty.xml",
- * BasicStructuredDocument.class, StructuredTextPartitionerForXML.class); }
- *
- * public void testNearEmptyHTML() throws ResourceAlreadyExists,
- * ResourceInUse, IOException, CoreException {
- * doTestNotEmpty("testfiles/html/nearEmpty.html",
- * BasicStructuredDocument.class, StructuredTextPartitionerForHTML.class); }
- */
- private void doTestNotEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = doTestCreate(filePath, expectedDocumentClass, expectedPartioner);
- assertNotNull("contents were null", contents);
- assertTrue("contents were empty", contents.length() > 0);
-
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestNotEmptyDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredDocument document = modelManager.createStructuredDocumentFor(file);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- contents = document.get();
- assertNotNull("contents were null", contents);
- assertTrue("contents were empty", contents.length() > 0);
-
- }
-
- private void doTestNonExistentDocument(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- boolean expectedExceptionCaught = false;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredDocument document = null;
- try {
- document = modelManager.createStructuredDocumentFor(file);
- }
- catch (FileNotFoundException e) {
- expectedExceptionCaught = true;
- }
-
- if (expectedExceptionCaught) {
- document = modelManager.createNewStructuredDocumentFor(file);
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- contents = document.get();
- assertNotNull("contents were null", contents);
- assertTrue("contents were *not* empty as expected", contents.length() == 0);
- }
- else {
- assertTrue("FileNotFound exception was *not* thrown as expected", false);
- }
-
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private void doTestReload(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
- InputStream inStream = null;
- try {
- inStream = file.getContents();
- model.reload(inStream);
- assertNotNull(model);
- IStructuredDocument documentReloaded = model.getStructuredDocument();
- // note: NOT same instance of document
- // FIXME: this test has to be changed back, once the reload
- // API is
- // fixed to work with different document.
- // assertFalse(document == documentReloaded);
- assertTrue(document == documentReloaded);
- }
- finally {
- if (inStream != null) {
- inStream.close();
- }
- }
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private String doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- // file will be null if the resource does not exist
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, true);
- try {
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
- contents = document.get();
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
-
- testClone(model);
-
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- return contents;
- }
-
- private void testClone(IStructuredModel structuredModel) throws IOException {
- IDOMDocument document = ((IDOMModel) structuredModel).getDocument();
- INodeNotifier notifier = document;
- ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) notifier.getAdapterFor(ModelQueryAdapter.class);
- assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
-
- IStructuredModel newModel = structuredModel.newInstance();
- IDOMDocument newDocument = ((IDOMModel) newModel).getDocument();
- INodeNotifier newNotifier = newDocument;
- ModelQueryAdapter result = (ModelQueryAdapter) newNotifier.getAdapterFor(ModelQueryAdapter.class);
- assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
-
- }
-
- /**
- * @param string
- * @param class1
- * @param class2
- * @throws CoreException
- * @throws IOException
- * @throws ResourceInUse
- * @throws ResourceAlreadyExists
- */
- private String doTestCreateModelWithNonExistIFile(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws ResourceAlreadyExists, ResourceInUse, IOException, CoreException {
- String contents = null;
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IFile file = (IFile) fTestProject.findMember(filePath);
- // file will be null if the resource does not exist
- if (file == null) {
- file = fTestProject.getFile(filePath);
- }
- IStructuredModel model = modelManager.getNewModelForEdit(file, false);
- try {
- assertNotNull(model);
- IStructuredDocument document = model.getStructuredDocument();
- assertNotNull(document);
- contents = document.get();
- assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
- IDocumentPartitioner setupPartitioner = null;
- if (Utilities.contains(expectedDocumentClass.getInterfaces(), IDocumentExtension3.class)) {
- setupPartitioner = ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
- }
- else {
- setupPartitioner = document.getDocumentPartitioner();
- }
- assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(setupPartitioner));
- }
- finally {
- if (model != null)
- model.releaseFromEdit();
- }
- return contents;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
deleted file mode 100644
index 98d730e9e..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/modelquery/ModelQueryTester.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.modelquery;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestsPlugin;
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author pavery
- */
-public class ModelQueryTester extends TestCase {
-
- private final boolean testShippedDTDLookup = false;
-
- // Our Structured Model, which should always be an XMLModel (or subclass)
- protected IDOMModel fModel = null;
-
- protected ModelQuery fModelQuery = null;
-
- public ModelQueryTester(String name) {
- super(name);
- }
-
- protected static Test suite() {
- return new TestSuite(ModelQueryTester.class);
- }
-
- public static void main(java.lang.String[] args) {
- if (args == null || args.length == 0) {
- runAll();
- } else if (args.length == 1) {
- String methodToRun = args[0].trim();
- runOne(methodToRun);
- }
-
- }
-
- protected static void runAll() {
- TestRunner.run(suite());
-
- }
-
- protected static void runOne(String methodName) {
- TestSuite testSuite = new TestSuite();
- TestCase test = new ModelQueryTester(methodName);
- testSuite.addTest(test);
- junit.textui.TestRunner.run(testSuite);
- }
-
- /**
- * Create an empty HTML model
- */
- protected void setUpHTML() {
- fModel = (IDOMModel) createModel(ContentTypeIdForHTML.ContentTypeID_HTML);
- initVars();
- }
-
- /**
- * Create an empty XML model
- */
- protected void setUpXML() {
- fModel = (IDOMModel) createModel(ContentTypeIdForXML.ContentTypeID_XML);
- initVars();
- }
-
-
- /**
- * Initialize local fields for this test
- */
- protected void initVars() {
- fModelQuery = ModelQueryUtil.getModelQuery(fModel.getDocument());
-
-
- }
-
- /**
- * Test the HTML BODY Element for the "bgcolor" attribute declaration
- */
- public void testBodyElement() {
- setUpHTML();
- fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
- // text
-
- // TEST getting a CMElementDeclaration
- Element bodyElement = (Element) fModel.getIndexedRegion(7); // node at
- // offset7--should
- // be
- // <body>
- CMElementDeclaration bodyDecl = fModelQuery.getCMElementDeclaration(bodyElement);
-
- int contentType = bodyDecl.getContentType();
- assertTrue("CMElementDeclaration CONTENT TYPE INCORRECT FOR BODY", (contentType == CMElementDeclaration.MIXED));
-
- // get permissible attrs
- CMNamedNodeMap map = bodyDecl.getAttributes();
- assertTrue("ATTRIBUTES FROM ELEMENT DECLARATION == NULL", (map != null));
- Vector allowed = new Vector();
- for (int i = 0; i < map.getLength(); i++) {
- CMAttributeDeclaration node = (CMAttributeDeclaration) map.item(i);
- String name = node.getNodeName();
- allowed.add(name);
- if (name.equalsIgnoreCase("bgcolor")) {
- assertTrue("GOT INCORRECT ATTRIBUTE NODE TYPE", (node.getNodeType() == CMNode.ATTRIBUTE_DECLARATION));
-
- CMDataType attrType = node.getAttrType();
- // System.out.println("attribute type > " + attrType);
- assertTrue("COULD NOT GET ATTRIBUTE TYPE", (attrType != null));
- assertTrue("COULDN'T GET IMPLIED VALUE KIND", (attrType.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_NONE));
- }
- }
- }
-
- /**
- * Test the HTML HTML Element for its declared children
- */
- public void testHtmlChildren() {
- setUpHTML();
- fModel.getStructuredDocument().set("<html></html>"); // set text
- Element htmlElement = fModel.getDocument().getDocumentElement();
- CMElementDeclaration htmlDecl = fModelQuery.getCMElementDeclaration(htmlElement);
-
- // HTML's children are within a group
- CMContent contents = htmlDecl.getContent();
-
- assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
- CMGroup group = (CMGroup) contents;
- int operator = group.getOperator();
- CMNodeList childList = group.getChildNodes();
- int max = contents.getMaxOccur();
- int min = contents.getMinOccur();
-
- // the group should be allowed once, with a sequence whose first entry
- // is the declaration for HEAD
- assertTrue("occurrance of group", min == 1 && max == 1);
- assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
- assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
- assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equalsIgnoreCase(HTML40Namespace.ElementName.HEAD));
-
- assertTrue("content descriptor type, position 1", childList.item(1).getNodeType() == CMNode.GROUP);
- // The second child should be a group as well, containing BODY and
- // FRAMESET with an
- // operator of CMGroup.CHOICE
- assertTrue("content descriptor type, position 1 - relationship of group", ((CMGroup) childList.item(1)).getOperator() == CMGroup.CHOICE);
- }
-
- public void testFormMethodAttr() {
- setUpHTML();
- fModel.getStructuredDocument().set("<html><body bgcolor=\"#ffffff\"><form method=\"post\"></form></body></html>"); // set
- // text
-
- // TEST GETTING A CMAttributeDeclaratoin
- Element formElement = (Element) fModel.getIndexedRegion(31); // <form>
- Attr attrNode = formElement.getAttributeNode(HTML40Namespace.ATTR_NAME_METHOD);
- CMAttributeDeclaration methodAttrDecl = fModelQuery.getCMAttributeDeclaration(attrNode);
- assertTrue("Content Model missing the attribute declaration for \"method\"", methodAttrDecl != null);
-
- List values = getValidStrings(formElement, methodAttrDecl);
- assertTrue("wrong number of values for attribute \"method\"", (values.size() == 2));
- assertTrue("default value for attribute \"method\" is wrong", (methodAttrDecl.getAttrType().getImpliedValue().equalsIgnoreCase("get")));
- }
-
- /**
- * A short test to ensure that a DTD can be loaded from a system
- * reference.
- *
- * Note: May require a functioning network connection for the references
- * to be resolved properly.
- */
- public void testDTDLoadFromSystemID_1() {
- if (testShippedDTDLookup) {
- setUpXML();
- URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
- String diskLocation = null;
- try {
- diskLocation = Platform.resolve(installationPath).toExternalForm();
- } catch (IOException e) {
- } catch (NullPointerException e) {
- }
- assertTrue("failed to resolve plugin install path", diskLocation != null);
- String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "TestFiles/DTDs/wapDTDs/WAP-2-0/wml20.dtd\"" + "><html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:wml=\"http://www.wapforum.org/2001/wml\"></html>";
- fModel.getStructuredDocument().set(content);
- CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
- Node domNode = (Node) fModel.getIndexedRegion(content.length() - 2);
- CMNode node = fModelQuery.getCMNode(domNode);
- assertTrue("wml20.dtd failed to load", node != null && node.getNodeName().equalsIgnoreCase("html"));
- }
- }
-
-
- /**
- * A short test to ensure that a DTD, the XHTML 1.0 Transitional one, can
- * be loaded from a system reference.
- *
- * Note: May require a functioning network connection for the references
- * to be resolved properly.
- */
- public void testDTDLoadFromSystemID_2() {
- if (testShippedDTDLookup) {
- URL installationPath = Platform.getBundle(JSPUITestsPlugin.ID).getEntry("/");
- String diskLocation = null;
- try {
- diskLocation = Platform.resolve(installationPath).toExternalForm();
- } catch (IOException e) {
- } catch (NullPointerException e) {
- }
- assertTrue("failed to resolve plugin install path", diskLocation != null);
- setUpXML();
- String content = "<?xml version=\"1.0\"?><!DOCTYPE html SYSTEM " + diskLocation + "testfiles/XHTML/xhtml1-transitional.dtd\"" + "><html></html>";
- fModel.getStructuredDocument().set(content);
-
- CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
- documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-
- // see defect 282429
- CMElementDeclaration htmlDecl = (CMElementDeclaration) fModelQuery.getCMNode((Node) fModel.getIndexedRegion(content.length() - 2));
- assertTrue("xhtml1-transitional.dtd not loaded", htmlDecl != null);
-
- // HTML's children are within a group
- CMContent contents = htmlDecl.getContent();
-
- assertTrue("content type is not a group", contents.getNodeType() == CMNode.GROUP);
-
- CMGroup group = (CMGroup) contents;
- int operator = group.getOperator();
- CMNodeList childList = group.getChildNodes();
- int max = contents.getMaxOccur();
- int min = contents.getMinOccur();
-
- // the group should be allowed once, with a sequence whose first
- // entry
- // is the declaration for HEAD
- assertTrue("occurrance of group", min == 1 && max == 1);
- assertTrue("relationship in group", operator == CMGroup.SEQUENCE);
- assertTrue("content descriptor type, position 0", contents.getNodeType() == CMNode.GROUP);
- assertTrue("child order (HEAD first)", childList.item(0).getNodeName().equals(HTML40Namespace.ElementName.HEAD.toLowerCase()));
- assertTrue("child order (BODY second)", childList.item(1).getNodeName().equals(HTML40Namespace.ElementName.BODY.toLowerCase()));
- }
- }
-
- /**
- * A short test to ensure that the DTD for JSP 1.2 tag libraries can be
- * loaded from a public reference registered in the XML catalog
- */
- public void testDTDLoadFromPublicID() {
- // No longer provided in WTP
- // TODO: provide DTD?
-// if (testShippedDTDLookup) {
-// setUpXML();
-// String contents = "<!DOCTYPE taglib PUBLIC \"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN\"> <taglib><tag>foo</tag></taglib>";
-// fModel.getStructuredDocument().set(contents);
-//
-// CMDocumentManager documentManagaer = fModelQuery.getCMDocumentManager();
-// documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, false);
-// documentManagaer.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, true);
-//
-//
-// // taglib
-// CMNode node = fModelQuery.getCMNode((Node) fModel.getIndexedRegion(contents.length() - 2));
-// assertTrue("web-jsptaglibrary_1_2.dtd failed to load through catalog", node != null && node.getNodeType() == CMNode.ELEMENT_DECLARATION && node.getNodeName().equalsIgnoreCase("taglib"));
-//
-// // tag
-// node = fModelQuery.getCMNode((Node) fModel.getIndexedRegion(contents.length() - 12));
-// assertTrue("CMElementDeclaration for \"tag\" from web-jsptaglibrary_1_2.dtd is missing", node != null && node.getNodeType() == CMNode.ELEMENT_DECLARATION && node.getNodeName().equalsIgnoreCase("tag"));
-// CMContent content = ((CMElementDeclaration) node).getContent();
-// assertTrue("only one occurrence of child group allowed", content.getNodeType() == CMNode.GROUP && content.getMaxOccur() == 1);
-// }
- }
-
-
-
- public static IStructuredModel createModel(String contentTypeID) {
- // create an empty model with its default factories
- IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-
- // add editor adapter factories
- AdapterFactoryRegistry adapterRegistry = JSPUIPlugin.getDefault().getAdapterFactoryRegistry();
- Iterator adapterList = adapterRegistry.getAdapterFactories();
- // And all those appropriate for this particular type of content
- while (adapterList.hasNext()) {
- try {
- AdapterFactoryProvider provider = (AdapterFactoryProvider) adapterList.next();
- if (provider.isFor(model.getModelHandler())) {
- provider.addAdapterFactories(model);
- }
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
- return model;
- }
-
- /**
- * Return the valid values for an attribute with the given declaration on
- * the given element. Derived from XMLPropertySource
- */
- private List getValidStrings(Element element, CMAttributeDeclaration attrDecl) {
- CMDataType valuesHelper = attrDecl.getAttrType();
- Vector values = new Vector();
-
- if (valuesHelper.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED && valuesHelper.getImpliedValue() != null) {
- // FIXED value
- values.add(valuesHelper.getImpliedValue());
- } else {
- // ENUMERATED values
- String[] valueStrings = null;
- // new way
- valueStrings = fModelQuery.getPossibleDataTypeValues(element, attrDecl);
- if (valueStrings == null)
- // older way
- valueStrings = attrDecl.getAttrType().getEnumeratedValues();
- if (valueStrings != null) {
- for (int i = 0; i < valueStrings.length; i++) {
- values.add(valueStrings[i]);
- }
- }
- }
- if (valuesHelper.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE && valuesHelper.getImpliedValue() != null) {
- if (!values.contains(valuesHelper.getImpliedValue()))
- values.add(valuesHelper.getImpliedValue());
- }
-
- return values;
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
deleted file mode 100644
index 82eccdf94..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ColorRegions.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/21/00 4:14:40 PM)
- * @author: David Williams
- */
-public class ColorRegions extends java.util.Vector {
- /**
- * Default <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * ColorRegions constructor comment.
- */
- public ColorRegions() {
- super();
- }
-
- /**
- * ColorRegions constructor comment.
- * @param initialCapacity int
- */
- public ColorRegions(int initialCapacity) {
- super(initialCapacity);
- }
-
- /**
- * ColorRegions constructor comment.
- * @param initialCapacity int
- * @param capacityIncrement int
- */
- public ColorRegions(int initialCapacity, int capacityIncrement) {
- super(initialCapacity, capacityIncrement);
- }
-
- public int[] asIntArray() {
- trimToSize();
- int arraySize = elementData.length;
- int[] results = new int[arraySize];
- //
- for (int i = 0; i < arraySize; i++) {
- results[i] = ((Integer) elementData[i]).intValue();
- }
- //
- return results;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
deleted file mode 100644
index a3f4676aa..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/DebugDocument.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.PrintStream;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class DebugDocument {
-
- public static void dump(Document document) {
- if (document == null)
- return;
- System.out.println("Dump of DOM"); //$NON-NLS-1$
-
- dump(document, System.out);
-
- //
- System.out.println();
- System.out.println("= = = = = ="); //$NON-NLS-1$
- System.out.println();
-
- }
-
- public static void dump(Document document, PrintStream out) {
- Node node = document.getFirstChild();
- while (node != null) {
- dump(node, out);
- node = node.getNextSibling();
- }
-
- }
-
- public static void dump(Node topNode) {
- dump(topNode, System.out);
- }
-
- public static void dump(Node topNode, PrintStream out) {
- if (topNode == null)
- return;
- // print out this node
- //
- printNode(topNode, out);
-
- // now print out its children
- //NodeList nodes = topNode.getChildNodes();
- //int len = nodes.getLength();
- //for (int i = 0; i < len; i++) {
-
- //Node node = nodes.item(i);
- //dump(node, out);
- //}
- }
-
- public static void printNode(Node topNode) {
- printNode(topNode, System.out);
-
- }
-
- public static void printNode(Node topNode, PrintStream out) {
- // print out this node
- //
- IStructuredDocumentRegion firstStructuredDocumentRegion = ((IDOMNode) topNode).getFirstStructuredDocumentRegion();
- IStructuredDocumentRegion lastStructuredDocumentRegion = ((IDOMNode) topNode).getLastStructuredDocumentRegion();
- if ((firstStructuredDocumentRegion == null) || (lastStructuredDocumentRegion == null)) {
- // no text to output
- } else {
- int start = firstStructuredDocumentRegion.getStart();
- int end = lastStructuredDocumentRegion.getEnd();
-
- String outString = topNode.toString();
- outString = org.eclipse.wst.sse.core.internal.util.StringUtils.escape(outString);
- out.println("[" + start + ", " + end + "]" + outString); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- // now do its children
- NodeList nodes = topNode.getChildNodes();
- int len = nodes.getLength();
- for (int i = 0; i < len; i++) {
- Node childNode = nodes.item(i);
- printNode(childNode, out);
- }
-
- }
-
- public DebugDocument() {
- super();
- }
-
-}
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
deleted file mode 100644
index aa76a6d60..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScannerUnitTests.java
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.modelhandler.ModelHandlerForJSP;
-import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTagParser;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.CoreNodeList;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * @author Nitin Dahyabhai <nitind@us.ibm.com>
- */
-public class ScannerUnitTests extends TestCase {
-
- public static boolean checkComplexRegionTypes(ITextRegionList regions, String[] contexts, String[][] embeddedContexts) {
-
- int embedCount = 0;
- Iterator iterator = regions.iterator();
- for (int i = 0; i < contexts.length; i++) {
- if (!iterator.hasNext())
- return false;
- ITextRegion region = (ITextRegion) iterator.next();
- if (region.getType() == contexts[i]) {
- if (region instanceof ITextRegionContainer) {
- ITextRegionContainer container = (ITextRegionContainer) region;
- boolean embeddedResult = checkSimpleRegionCount(container, embeddedContexts[embedCount].length) && checkSimpleRegionTypes(container.getRegions(), embeddedContexts[embedCount]);
- embedCount++;
- if (embeddedResult)
- continue;
- else
- return false;
- }
- else {
- continue;
- }
- }
- return false;
- }
- return true;
- }
-
- public static boolean checkModelLength(IStructuredDocument document, int length) {
- return checkModelLength(document.getLastStructuredDocumentRegion(), length);
- }
-
- public static boolean checkModelLength(IStructuredDocumentRegion region, int length) {
- return region.getEndOffset() == length;
- }
-
- public static boolean checkSimpleRegionCount(ITextRegionContainer regionContainer, int size) {
-
- // yes, this looks silly, but it makes it easier to find the exact
- // failure point
- if (!(regionContainer.getRegions().size() == size))
- return false;
- return true;
- }
-
- public static boolean checkSimpleRegionCounts(IStructuredDocumentRegionList regionContainers, int[] sizes) {
-
- int containers = regionContainers.getLength();
- if (containers != sizes.length)
- return false;
- for (int i = 0; i < sizes.length; i++) {
- if (i >= containers)
- return false;
- if (regionContainers.item(i).getNumberOfRegions() == sizes[i])
- continue;
- return false;
- }
- return true;
- }
-
- public static boolean checkSimpleRegionTypes(ITextRegionList regions, String[] contexts) {
-
- for (int i = 0; i < contexts.length; i++) {
- ITextRegion region = regions.get(i);
- if (region.getType() == contexts[i])
- continue;
- // else
- // Sys("region "+ i + ": "+region.getType()+" != " + contexts[i]);
- return false;
- }
- return true;
- }
-
- public static String loadChars(InputStream input) {
-
- StringBuffer s = new StringBuffer();
- try {
- int c = -1;
- while ((c = input.read()) >= 0) {
- if (c > 255)
- break;
- s.append((char) c);
- }
- input.close();
- }
- catch (IOException e) {
- System.out.println("An I/O error occured while scanning :");
- System.out.println(e);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return s.toString();
- }
-
- /**
- * Starts the application.
- *
- * @param args
- * an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
-
- if (args == null || args.length == 0) {
- runAll();
- }
- else if (args.length == 1) {
- String methodToRun = args[0].trim();
- runOne(methodToRun);
- }
- }
-
- protected static void runAll() {
-
- junit.textui.TestRunner.run(suite());
- }
-
- protected static void runOne(String methodName) {
-
- TestSuite testSuite = new TestSuite();
- TestCase test = new ScannerUnitTests(methodName);
- testSuite.addTest(test);
- junit.textui.TestRunner.run(testSuite);
- }
-
- protected static Test suite() {
-
- return new TestSuite(ScannerUnitTests.class);
- }
-
- public static void verifyLengths(int startOffset, IStructuredDocumentRegion firstDocumentRegion, String text) {
- IStructuredDocumentRegion holdRegion = firstDocumentRegion;
- assertTrue("document does not start at expected offset", holdRegion.getStartOffset() == startOffset);
- int lastEnd = 0;
- while (holdRegion != null && holdRegion.getEndOffset() > 0) {
- assertTrue("zero-length StructuredDocumentRegion found", holdRegion.getStartOffset() == lastEnd);
- assertTrue("TextRegionless StructuredDocumentRegion found", holdRegion.getNumberOfRegions() > 0);
- ITextRegionList list = holdRegion.getRegions();
- int index = 0;
- for (int i = 0; i < list.size(); i++) {
- ITextRegion region = list.get(i);
- assertTrue("text region seams don't match", region.getStart() == index);
- index += region.getLength();
- }
- lastEnd = holdRegion.getEndOffset();
- holdRegion = holdRegion.getNext();
- }
-
- holdRegion = firstDocumentRegion;
- while (holdRegion != null && holdRegion.getNext() != null) {
- holdRegion = holdRegion.getNext();
- }
- checkModelLength(holdRegion, text.length());
- }
-
- public static void verifyLengths(int startOffset, IStructuredDocumentRegionList list, String text) {
- verifyLengths(startOffset, list.item(0), text);
- }
-
- public static void verifyLengths(IStructuredDocument document, String text) {
- verifyLengths(0, document.getFirstStructuredDocumentRegion(), text);
- }
-
- public static void verifyLengths(IStructuredModel model, String text) {
- verifyLengths(model.getStructuredDocument(), text);
- }
-
- protected IStructuredDocument fModel;
- protected String input;
- private BlockTagParser parser;
- protected Object type;
-
- public ScannerUnitTests(String name) {
-
- super(name);
- }
-
- protected void appendTagBlock(StringBuffer buffer, String tagname, int length) {
-
- buffer.append('<');
- buffer.append(tagname);
- buffer.append('>');
- for (int i = 0; i < length; i++)
- buffer.append('_');
- buffer.append("</");
- buffer.append(tagname);
- buffer.append('>');
- }
-
- protected void setUp() {
-
- setUpXML(null);
- }
-
- protected IStructuredDocumentRegionList setUpJSP(String text) {
-
- setupModel(new ModelHandlerForJSP());
- parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
-
- /*
- * IStructuredDocumentRegionList nodes = setUpJSP("content <script>
- * <%= expression %> </script> <a> </a> <foo:disallowJSP> <%= %>
- * </foo:disallowJSP> >"); parser.addBlockMarker(new
- * BlockMarker("jsp:declaration", null,
- * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
- * BlockMarker("jsp:expression", null,
- * XMLJSPRegionContexts.JSP_CONTENT, true)); parser.addBlockMarker(new
- * BlockMarker("jsp:scriptlet", null,
- * XMLJSPRegionContexts.JSP_CONTENT, true));
- */
- input = text;
- fModel.set(input);
- return fModel.getRegionList();
- }
-
- protected void setupModel(IModelHandler contentType) {
-
- fModel = (IStructuredDocument) contentType.getDocumentLoader().createNewStructuredDocument();
- this.parser = (BlockTagParser) fModel.getParser();
- }
-
- protected IStructuredDocumentRegionList setUpXML(String text) {
-
- setupModel(new ModelHandlerForXML());
- parser.addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("style", null, DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("disallowJSP", null, DOMRegionContext.BLOCK_TEXT, true, false));
- input = text;
- fModel.set(input);
- return fModel.getRegionList();
- }
-
- protected void testBlockScanBufferBoundaries(String contentTypeID) {
- IStructuredDocument document = null;
- // the interesting offsets are around 16k (16384)
- // for (int i = 16500; i > 16100; i--) {
- // for (int i = 17000; i > 15000; i--) {
- for (int i = 16384 + 25; i > 16364 - 25; i--) {
- StringBuffer text = new StringBuffer();
- document = StructuredModelManager.getModelManager().createStructuredDocumentFor(contentTypeID);
- appendTagBlock(text, "script", i);
- String string = text.toString();
- try {
- document.setText(this, string);
- verifyLengths(document, string);
- assertTrue("too few document regions [run value " + i + "] ", new CoreNodeList(document.getFirstStructuredDocumentRegion()).getLength() == 3);
- verifyLengths(document, string);
- IStructuredDocumentRegion startTag = document.getFirstStructuredDocumentRegion();
- IStructuredDocumentRegion middleBlock = startTag.getNext();
-// IStructuredDocumentRegion endTag = middleBlock.getNext();
- assertTrue("not block text in middle", middleBlock.getFirstRegion().getType() == DOMRegionContext.BLOCK_TEXT);
- }
- catch (Exception e) {
- assertNull("exception caught" + e, e);
- }
- //System.gc();
- }
- }
-
- public void testBlockScanBufferBoundariesForHTML() {
- testBlockScanBufferBoundaries("org.eclipse.wst.html.core.htmlsource");
- }
-
- public void testBlockScanBufferBoundariesForJSP() {
- testBlockScanBufferBoundaries("org.eclipse.jst.jsp.core.jspsource");
- }
-
- private void testBlockTag(IStructuredDocumentRegionList nodes) {
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT})
- && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testBlockTag_JSP() {
- testBlockTag(setUpJSP("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
- }
-
- /**
- * Check block tag scanning between XML content
- */
- public void testBlockTag_XML() {
-
- testBlockTag(setUpXML("begin <scrIPt type=\"pl2\"> </scrip t></scripts></scripts <///<!- ---></sCrIPt> end"));
- }
-
- /**
- * Check block tag scanning between XML content
- */
- public void testBlockTagWithJSPExpressions() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("begin <script type=\"pl2\"> <%= \"expression\"%> </scrIPt> <a></a> <disallowJSP> <%= \"expression\" %> </disallowJSP> end");
-
- // OLD
- // boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6,
- // 3, 3, 1, 3, 3, 1, 3, 3, 3, 1});
- // NEW
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 3, 3, 1, 3, 3, 1, 3, 1, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- int i = 0;
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE})
- && checkComplexRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN,
- DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE}})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- // CORRECT BEHAVIOR
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT})
- // OLD, BROKEN BEHAVIOR
- // && checkSimpleRegionTypes(nodes.item(i++).getRegions(),
- // new
- // String[]{
- // XMLRegionContext.BLOCK_TEXT,
- // XMLRegionContext.BLOCK_TEXT,
- // XMLRegionContext.BLOCK_TEXT})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(i++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- private void testBufferUnderRun_1(IStructuredDocumentRegionList nodes) {
-
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 2});
- assertTrue("IStructuredDocumentRegion region count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testBufferUnderRun_1_JSP() {
- testBufferUnderRun_1(setUpJSP("content <tag a=b/><!--c"));
- }
-
- /**
- * Check for buffer under-runs on block scanning
- */
- public void testBufferUnderRun_1_XML() {
- testBufferUnderRun_1(setUpXML("content <tag a=b/><!--c"));
- }
-
- private void testBufferUnderRun_2(IStructuredDocumentRegionList nodes) {
-
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6, 1});
- assertTrue("IStructuredDocumentRegion region count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testBufferUnderRun_2_JSP() {
-
- testBufferUnderRun_2(setUpJSP("content <tag a=b/><!--"));
- }
-
- /**
- * Check for buffer under-runs on block scanning
- */
- public void testBufferUnderRun_2_XML() {
-
- testBufferUnderRun_2(setUpXML("content <tag a=b/><!--"));
- }
-
- private void testCDATA(IStructuredDocumentRegionList nodes) {
-
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testCDATA_JSP() {
-
- testCDATA(setUpJSP("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
- }
-
- /**
- * Check CDATA section scanning between content
- */
- public void testCDATA_XML() {
-
- testCDATA(setUpXML("a <![CDATA[<>!!<!!></&&&--<!--]]> b"));
- }
-
- public void testCDATAinBlockJSP1() {
- setUpJSP("<script><![CDATA[ contents]]></script>");
- }
-
- public void testCDATAinBlockJSP2() {
- setUpJSP("<script><![CDATA[</script>]]></script>");
- }
-
- public void testCDATAinBlockJSP2a() {
- setUpJSP("<script><![CDATA[contents</script>]]></script>");
- }
-
- public void testCDATAinBlockJSP2b() {
- setUpJSP("<script><![CDATA[</script>contents]]></script>");
- }
-
- public void testCDATAinBlockJSP3() {
- setUpJSP("<script><![CDATA[]]></script>");
- }
-
- public void testCDATAinBlockJSP4() {
- setUpJSP("<script><![CDATA[ ]]>");
- }
-
- public void testCDATAinBlockJSP5() {
- setUpJSP("<script><![CDATA[ ]]]>");
- }
-
- public void testCDATAinBlockJSP6() {
- setUpJSP("<script><![CDATA[ ]]");
- }
-
- public void testCDATAinBlockJSP7() {
- setUpJSP("<script><![CDATA[ ");
- }
-
- public void testCDATAinBlockJSP8() {
- setUpJSP("<script><![CDATA[");
- }
-
- public void testCDATAinBlockXML1() {
- setUpXML("<script><![CDATA[ ]]></script>");
- }
-
- public void testCDATAinBlockXML2() {
- setUpXML("<script><![CDATA[</script>]]></script>");
- }
-
- public void testCDATAinBlockXML3() {
- setUpXML("<script><![CDATA[]]></script>");
- }
-
- public void testCDATAinBlockXML4() {
- setUpXML("<script><![CDATA[ ]]>");
- }
-
- public void testCDATAinBlockXML5() {
- setUpXML("<script><![CDATA[ ]]]>");
- }
-
- public void testCDATAinBlockXML6() {
- setUpXML("<script><![CDATA[ ]]");
- }
-
- public void testCDATAinBlockXML7() {
- setUpXML("<script><![CDATA[ ");
- }
-
- public void testCDATAinBlockXML8() {
- setUpXML("<script><![CDATA[");
- }
-
- /**
- * Check comments between XML content
- */
- public void testComments_JSP() {
- String text = "a <!-- --><!----><%-- --%> b";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 2, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE})
- && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE})
- && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check comments between JSP content
- */
- public void testComments_XML() {
- String text = "a <!-- --><<!---->b";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 2, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN})
- && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_CLOSE})
- && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- private void testContent(IStructuredDocumentRegionList nodes) {
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- /**
- * Check simple content scanning
- */
- public void testContentJSP() {
-
- testContent(setUpJSP("hello world"));
- }
-
- public void testContentXML() {
-
- testContent(setUpXML("hello world"));
- }
-
- public void testDollarsign_Leading() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$ \"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testDollarsign_Single() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"$\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testDollarsign_SingleWithSpaces() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\" $ \"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testELinContent() {
- String text = "${out.foo}";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
-
- public void testELtolerance_transparency_Dquote() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"${out.foo}\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN,
- DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testELtolerance_transparency_DquoteWithSpaces() {
- // note: whitespace on either side returns a WHITE_SPACE context
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\"_${out.foo}_\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
- DOMJSPRegionContexts.JSP_EL_OPEN, DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testELtolerance_transparency_Squote() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type='${out.foo}'/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_EL_OPEN,
- DOMJSPRegionContexts.JSP_EL_CONTENT, DOMJSPRegionContexts.JSP_EL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPDeclaration() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%! int foo; %>\" baz=\"il\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,},
- new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE,
- DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPDeclarationInCDATA() {
- IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%!%>]]>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{
- DOMJSPRegionContexts.JSP_DECLARATION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPExpression() {
- IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<%= \"Hello, World\"%>\" baz=\"il\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,},
- new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE,
- DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPExpressionInCDATA() {
- IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%=%>]]>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{
- DOMJSPRegionContexts.JSP_EXPRESSION_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPScriptlet() {
- IStructuredDocumentRegionList nodes = setUpJSP("content <foo bar=\"<% %>\" baz=\"il\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 9});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkComplexRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE,},
- new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CONTENT, DOMJSPRegionContexts.JSP_CLOSE,
- DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.WHITE_SPACE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedJSPScriptletInCDATA() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("<![CDATA[<%%>]]>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CDATA_OPEN, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_CDATA_CLOSE,}, new String[][]{{
- DOMJSPRegionContexts.JSP_SCRIPTLET_OPEN, DOMJSPRegionContexts.JSP_CLOSE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testEmbeddedTagInAttr() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("<a href=\"<jsp:getProperty/>\">");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkComplexRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}, new String[][]{{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
- DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE}});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSP_DHTMLimport() {
- String text = "<a> <?import type=\"foo\">";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testJSP_PI() {
- String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPAmpersandInTagNameInAttValue() {
- String text = "<a href=\"<a&b>\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{7, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
- assertTrue("IStructuredDocumentRegion and ITextRegion count (broken embedded tag)", sizeCheck);
-
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
- DOMRegionContext.UNDEFINED});
- assertTrue("region context type check (broken embedded tag)", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check (content)", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testJSPCommentInXMLComment() {
- String text = "s<!--\n<%--c--%>\n-->\n<html>\n<body><script> <%--c--%> </script>\n";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 5, 1, 3, 1, 3, 3, 3, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- int item = 0;
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_COMMENT_OPEN, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_COMMENT_TEXT,
- DOMRegionContext.XML_COMMENT_CLOSE}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN, DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkComplexRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT, DOMRegionContext.BLOCK_TEXT}, new String[][]{{DOMJSPRegionContexts.JSP_COMMENT_OPEN,
- DOMJSPRegionContexts.JSP_COMMENT_TEXT, DOMJSPRegionContexts.JSP_COMMENT_CLOSE}})
- && checkSimpleRegionTypes(nodes.item(item++).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check that jsp:directive.(include|page|taglib) are recognized and
- * treated properly
- */
- public void testJSPDirectiveTags() {
- String text = "begin <jsp:directive.taglib> <jsp:directive.page a> <jsp:directive.include a=> <jsp:directive.pages a=b> end";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_DIRECTIVE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPDollarsign_Trailing() {
- String text = "<a type=\" $\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPDollarsign_TrailingInContent() {
- String text = "nnn$<a type=\" $\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check (content)", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check (content)", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check JSP code sections between HTML content
- */
- public void testJSPExpression() {
- IStructuredDocumentRegionList nodes = setUpJSP("begin <%= \"Hello,World\" %> end");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 1, 1, 1, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT}) && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMJSPRegionContexts.JSP_EXPRESSION_OPEN})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CONTENT}) && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMJSPRegionContexts.JSP_CLOSE})
- && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSPGreaterThanInAttValue() {
- IStructuredDocumentRegionList nodes = setUpJSP("<a type=\">next\"/>");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- assertTrue("region is not somple", !(nodes.item(0).getRegions().get(4) instanceof ITextRegionContainer));
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSPInvalidTagNameInAttValue() {
- String text = "S<a type=\"a<4\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
-
- assertTrue("IStructuredDocumentRegion and ITextRegion count (tag)", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(1).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(1).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
- DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check (att value)", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testJSPLessThanInAttValue() {
- //bails out of the attribute value with an UNDEFINED region for the
- // end quote
- String text = "<button label=\"<previous\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 4);
- assertTrue("IStructuredDocumentRegion and ITextRegion count (att value)", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
- DOMRegionContext.UNDEFINED});
- assertTrue("region context type check (att value)", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * Check JSP code sections, as a tag, scanning between HTML content
- */
- // public void testJSPScriptletTag() {
- // IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:scriptlet>
- // int foo = bar; //<jsp:Scriptlet>//</jsp:scriptlets</jsp:scriptlet>
- // end");
- //
- // boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
- // 3,
- // 1});
- // assertTrue("IStructuredDocumentRegion and ITextRegion count",
- // sizeCheck);
- //
- // boolean typeCheck =
- // checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
- // XMLRegionContext.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
- // XMLRegionContext.XML_TAG_OPEN,
- // XMLRegionContext.XML_TAG_NAME,
- // XMLRegionContext.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
- // XMLJSPRegionContexts.JSP_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
- // XMLRegionContext.XML_END_TAG_OPEN,
- // XMLRegionContext.XML_TAG_NAME,
- // XMLRegionContext.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT});
- // assertTrue("region context type check", typeCheck);
- //
- // verifyModelLength();
- // }
- /**
- * Check JSP code sections, as a tag, scanning between HTML content
- */
- // public void testJSPTextTag() {
- // IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:text> int
- // foo
- // = bar; //<jsp:TEXT>//</jsp:Texts</jsp:text> <a> </a> end");
- //
- // boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1,
- // 3,
- // 1, 3, 1, 3, 1});
- // assertTrue("IStructuredDocumentRegion and ITextRegion count",
- // sizeCheck);
- //
- // boolean typeCheck =
- // checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CDATA_TEXT})
- // && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_END_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT})
- // && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_END_TAG_OPEN,
- // XMLJSPRegionContexts.XML_TAG_NAME,
- // XMLJSPRegionContexts.XML_TAG_CLOSE})
- // && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{
- // XMLJSPRegionContexts.XML_CONTENT});
- // assertTrue("region context type check", typeCheck);
- //
- // verifyModelLength();
- // }
- /**
- * Check that jsp:root is recognized and treated properly
- */
- public void testJSPRootTag() {
-
- IStructuredDocumentRegionList nodes = setUpJSP("begin <jsp:root> <jsp:roots a> <jsp:roo a=> </jsp:root a=b><a>end");
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 3, 1, 4, 1, 5, 1, 6, 3, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(3).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(4).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(5).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(6).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(7).getRegions(), new String[]{DOMRegionContext.XML_END_TAG_OPEN, DOMJSPRegionContexts.JSP_ROOT_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(8).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE})
- && checkSimpleRegionTypes(nodes.item(9).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testJSPTagInAttValue() {
- String text = "<a type=\"<a/>\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check (tag)", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME,
- DOMRegionContext.XML_EMPTY_TAG_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check (att value)", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testNothinginBlockJSP9() {
- String text = "<script>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testNothinginBlockXML9() {
- String text = "<script>";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- private void testSimpleTag(IStructuredDocumentRegionList nodes) {
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 10, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME,
- DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
- DOMRegionContext.XML_TAG_CLOSE}) && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyModelLength();
- }
-
- public void testSimpleTag_JSP() {
- testSimpleTag(setUpJSP("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
- }
-
- /**
- * Check simple tag scanning between XML content
- */
- public void testSimpleTag_XML() {
- testSimpleTag(setUpXML("0 <tagname attr1 attr2=value2 attr3=\"value3\"> 1"));
- }
-
- public void testVBLinContent() {
- String text = "#{out.foo}";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- sizeCheck = checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(0)), 3);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(0)).getRegions(), new String[]{DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testVBLtolerance_transparency_Dquote() {
- String text = "<a type=\"#{out.foo}\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN,
- DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testVBLtolerance_transparency_DquoteWithSpaces() {
- // note: whitespace on either side returns a WHITE_SPACE context
- String text = "<a type=\"_#{out.foo}_\"/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 7);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
- DOMJSPRegionContexts.JSP_VBL_OPEN, DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_DQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testVBLtolerance_transparency_Squote() {
- String text = "<a type='#{out.foo}'/>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- sizeCheck &= checkSimpleRegionCount(((ITextRegionContainer) nodes.item(0).getRegions().get(4)), 5);
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- typeCheck &= checkSimpleRegionTypes(((ITextRegionContainer) nodes.item(0).getRegions().get(4)).getRegions(), new String[]{DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE, DOMJSPRegionContexts.JSP_VBL_OPEN,
- DOMJSPRegionContexts.JSP_VBL_CONTENT, DOMJSPRegionContexts.JSP_VBL_CLOSE, DOMJSPRegionContexts.XML_TAG_ATTRIBUTE_VALUE_SQUOTE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testXML_DHTMLimport() {
- String text = "<a> <?import type=\"foo\">";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{3, 1, 6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- typeCheck = checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_PI_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes, text);
- }
-
- public void testXML_PI() {
- String text = "begin <?php asda;lsgjalg;lasjlajglajslkajlgajsljgaljglaj?>end";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{1, 4, 1});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
-
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_CONTENT})
- && checkSimpleRegionTypes(nodes.item(1).getRegions(), new String[]{DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_PI_CONTENT, DOMRegionContext.XML_PI_CLOSE})
- && checkSimpleRegionTypes(nodes.item(2).getRegions(), new String[]{DOMRegionContext.XML_CONTENT});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testXMLDollarsign_Trailing() {
- String text = "<a type=\" $\"/>";
- IStructuredDocumentRegionList nodes = setUpXML(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{6});
- assertTrue("IStructuredDocumentRegion and ITextRegion count", sizeCheck);
- boolean typeCheck = checkSimpleRegionTypes(nodes.item(0).getRegions(), new String[]{DOMRegionContext.XML_TAG_OPEN, DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS,
- DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, DOMRegionContext.XML_EMPTY_TAG_CLOSE});
- assertTrue("region context type check", typeCheck);
- verifyLengths(0, nodes.item(0), text);
- }
-
- public void testUndefinedRegionContainer() {
- // see RATLC RATLC00284776
- String text = "<option <elms:inputValue value=\"<%=uomvox.uomID%>\"/><%=uomvox.uomID.equals(uomID) ? \" selected\" : \"\"%>>";
- IStructuredDocumentRegionList nodes = setUpJSP(text);
- boolean sizeCheck = checkSimpleRegionCounts(nodes, new int[]{5});
- assertTrue("IStructuredDocumentRegion and overall ITextRegion count", sizeCheck);
- // checkComplexRegionTypes(nodes.item(0).getRegions(), new
- // String[]{XMLRegionContext.XML_TAG_OPEN,
- // XMLRegionContext.XML_TAG_NAME,
- // XMLRegionContext.XML_TAG_ATTRIBUTE_NAME,
- // XMLRegionContext.UNDEFINED, XMLRegionContext.XML_TAG_CLOSE}, new
- // String[][] {{}});
- verifyEmbeddedContainerParentage(nodes);
- verifyLengths(0, nodes.item(0), text);
- }
-
- /**
- * @param nodes
- */
- private void verifyEmbeddedContainerParentage(IStructuredDocumentRegionList nodes) {
- for (int i = 0; i < nodes.getLength(); i++) {
- IStructuredDocumentRegion r = nodes.item(i);
- ITextRegionList list = r.getRegions();
- for (int j = 0; j < list.size(); j++) {
- ITextRegion region = list.get(j);
- if (region instanceof ITextRegionContainer) {
- assertNotNull("parent is null for " + region, ((ITextRegionContainer) region).getParent());
- }
- }
- }
- }
-
- protected boolean verifyModelLength() {
- return checkModelLength(fModel, input.length());
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
deleted file mode 100644
index 7c6aaad5a..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/ScanningTests.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentRegionIterator;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * test class for basic parsing and scanning
- */
-
-public class ScanningTests {
- private static IStructuredDocument textStore = null;
- private static long startTime = 0;
- private static long stopTime = 0;
-
- /**
- * ScanningTests constructor comment.
- */
- public ScanningTests() {
- super();
- }
-
- public static void checkNodeSeams(String fileName) {
- System.out.println("CHECKING NODE BOUNDARIES AND CONTENTS FOR " + fileName);
- Enumeration e = parseFile(fileName).elements();
- int lastEnd = 0;
- while (e.hasMoreElements()) {
- IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.nextElement();
- if (r.getStartOffset() != lastEnd)
- System.out.println("ERROR: dropped in " + r);
- if (r.getNumberOfRegions() < 1)
- System.out.println("ERROR: empty IStructuredDocumentRegion " + r);
- lastEnd = r.getEndOffset();
- }
- System.out.println("DONE");
- }
-
- public static void checkParse(String fileName) {
- checkTokenSeams(fileName);
- checkNodeSeams(fileName);
- }
-
- public static void checkTokenSeams(String fileName) {
- System.out.println("CHECKING TOKENIZER REGION BOUNDARIES FOR " + fileName);
- Iterator e = tokenizeFile(fileName).iterator();
- int lastEnd = 0;
- while (e.hasNext()) {
- IStructuredDocumentRegion r = (IStructuredDocumentRegion) e.next();
- if (r.getStartOffset() != lastEnd)
- System.out.println("ERROR: dropped in " + r);
- lastEnd = r.getEndOffset();
- }
- System.out.println("DONE");
- }
-
- public static char[] loadChars(String fileName) {
- char[] chars = null;
- int c = 0;
- int length = 0;
- int count = 0;
- File file = null;
- FileInputStream fis = null;
- try {
- file = new File(fileName);
- length = (int) file.length();
- chars = new char[length];
- fis = new FileInputStream(file);
- while (((c = fis.read()) >= 0) && (count < length)) {
- chars[count++] = (char) c;
- }
- }
- catch (FileNotFoundException e) {
- System.out.println("File not found : \"" + fileName + "\"");
- System.exit(1);
- }
- catch (ArrayIndexOutOfBoundsException e) {
- System.out.println("Usage : java JSPLexer3 <inputfile>");
- System.exit(1);
- }
- catch (IOException e) {
- System.out.println("An I/O error occured while scanning :");
- System.out.println(e);
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- return chars;
- }
-
- public static RegionParser newParser() {
- JSPSourceParser parser = new JSPSourceParser();
- parser.addBlockMarker(new BlockMarker("foo", null, DOMRegionContext.BLOCK_TEXT, true));
- parser.addBlockMarker(new BlockMarker("globalFoo", null, DOMRegionContext.BLOCK_TEXT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:expression", null, XMLJSPRegionContexts.JSP_CONTENT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:scriptlet", null, XMLJSPRegionContexts.JSP_CONTENT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:declaration", null, XMLJSPRegionContexts.JSP_CONTENT, true));
- // parser.addBlockMarker(new BlockMarker("jsp:text", null, XMLRegionContext.XML_CDATA_TEXT, true));
- return parser;
- }
-
- public static RegionParser newXMLParser() {
- XMLSourceParser parser = new XMLSourceParser();
- parser.addBlockMarker(new BlockMarker("Script", DOMRegionContext.BLOCK_TEXT, false));
- parser.addBlockMarker(new BlockMarker("stylE", DOMRegionContext.BLOCK_TEXT, false));
- return parser;
- }
-
- public static Vector parse(String stringdata) {
- return parse(stringdata, false);
- }
-
- public static Vector parse(String stringdata, boolean useXML) {
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- RegionParser parser = null;
- if (useXML)
- parser = newXMLParser();
- else
- parser = newParser();
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) creating a " + parser.getClass().getName());
- }
- // Caution: cast
- parser.reset(new StringReader(stringdata));
- IStructuredDocumentRegion aNode = setNodeDocument(parser.getDocumentRegions());
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
- textStore.setText(null, stringdata);
- StructuredDocumentRegionIterator.setParentDocument(aNode, textStore);
- Vector v = new Vector();
- while (aNode != null) {
- v.addElement(aNode);
- aNode = aNode.getNext();
- }
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) setting text and storing nodes");
- }
- return v;
- }
-
- public static Vector parseFile(String fileName) {
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- char[] input = loadChars(fileName);
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
- }
- return parse(new String(input));
- }
-
- private static IStructuredDocumentRegion setNodeDocument(IStructuredDocumentRegion startNode) {
- // Caution: cast
- IStructuredDocumentRegion aNode = startNode;
- while (aNode != null) {
- aNode.setParentDocument(textStore);
- aNode = aNode.getNext();
- }
- return startNode;
- }
-
- public static List tokenizeFile(String fileName) {
- List v = null;
- StringBuffer buff = new StringBuffer();
- try {
- //char[] input = loadChars(fileName);
- Reader input = new FileReader(fileName);
- RegionParser parser = newParser();
- // parser must be given input, before tokenizer is valid
- parser.reset(input);
- int c = 0;
- parser.getDocumentRegions();
- v = parser.getRegions();
- input.reset();
- while ((c = input.read()) >= 0) {
- buff.append((char) c);
- }
- textStore = StructuredDocumentFactory.getNewStructuredDocumentInstance(parser);
- textStore.setText(null, buff.toString());
- }
- catch (FileNotFoundException e) {
- System.out.println("File not found : \"" + fileName + "\"");
- }
- catch (IOException e) {
- }
- catch (ArrayIndexOutOfBoundsException e) {
- System.out.println("Usage : java JSPLexer3 <inputfile>");
- }
- return v;
- }
-
- public static String viewableTokenizeWithSeparator(String data) {
- StringBuffer s = new StringBuffer();
- s.append("\"");
- s.append(data);
- s.append("\"\n");
- s.append(viewableTokenize(data));
- s.append("--------------------------------------------------------------------------------\n");
- return s.toString();
- }
-
- public static String viewableTokenize(String stringdata) {
- return viewableTokenize(stringdata, false);
- }
-
- public static String viewableTokenize(String stringdata, boolean useXML) {
- java.util.List l = parse(stringdata, useXML);
- String s = "";
- for (int i = 0; i < l.size(); i++) {
- IStructuredDocumentRegion node = (IStructuredDocumentRegion) l.get(i);
- try {
- s += StringUtils.escape(node.toString()) + "\n";
- }
- catch (Exception e) {
- s += "[" + node.getStart() + ", " + node.getEnd() + "] (UNPRINTABLE " + e + ")";
- }
- ITextRegionList m = node.getRegions();
- for (int j = 0; j < m.size(); j++)
- if (m.get(j) instanceof ITextRegionContainer) {
- s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
- ITextRegionList n = ((ITextRegionContainer) m.get(j)).getRegions();
- for (int k = 0; k < n.size(); k++)
- s = s + "\t\t" + StringUtils.escape(n.get(k).toString()) + "\n";
- }
- else
- s = s + "\t" + StringUtils.escape(m.get(j).toString()) + "\n";
- }
- return s;
- }
-
- public static String viewableTokenizeFile(String fileName) {
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- if (Debug.perfTest) {
- startTime = System.currentTimeMillis();
- }
- char[] input = loadChars(fileName);
- if (Debug.perfTest) {
- stopTime = System.currentTimeMillis();
- System.out.println("ScanningTests spent " + (stopTime - startTime) + " (msecs) loading " + fileName);
- }
- return viewableTokenize(new String(input));
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/SimpleNode.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/SimpleNode.java
deleted file mode 100644
index ff3da7df0..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/SimpleNode.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.UserDataHandler;
-
-/**
- * Insert the type's description here. Creation date: (8/23/2000 9:24:02 PM)
- *
- * @author: Kit Lo
- */
-public class SimpleNode implements Node {
- String fNodeName;
-
- /**
- * SimpleNode constructor comment.
- */
- public SimpleNode() {
- super();
- }
-
- /**
- * SimpleNode constructor comment.
- */
- public SimpleNode(String nodeName) {
- fNodeName = nodeName;
- }
-
- /**
- * appendChild method comment.
- */
- public Node appendChild(Node newChild) throws DOMException {
- return null;
- }
-
- /**
- * cloneNode method comment.
- */
- public Node cloneNode(boolean deep) {
- return null;
- }
-
- /**
- * getAttributes method comment.
- */
- public NamedNodeMap getAttributes() {
- return null;
- }
-
- /**
- * getChildNodes method comment.
- */
- public NodeList getChildNodes() {
- return null;
- }
-
- /**
- * getFirstChild method comment.
- */
- public Node getFirstChild() {
- return null;
- }
-
- /**
- * getLastChild method comment.
- */
- public Node getLastChild() {
- return null;
- }
-
- /**
- * Returns the local part of the qualified name of this node. <br>
- * For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>createElement</code> from the
- * <code>Document</code> interface, this is always <code>null</code>.
- *
- * @ link DOM Level 2
- */
- public String getLocalName() {
- return null;
- }
-
- /**
- * The namespace URI of this node, or <code>null</code> if it is
- * unspecified. <br>
- * This is not a computed value that is the result of a namespace lookup
- * based on an examination of the namespace declarations in scope. It is
- * merely the namespace URI given at creation time. <br>
- * For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>createElement</code> from the
- * <code>Document</code> interface, this is always <code>null</code>.Per
- * the Namespaces in XML Specification an attribute does not inherit its
- * namespace from the element it is attached to. If an attribute is not
- * explicitly given a namespace, it simply has no namespace.
- *
- * @ link DOM Level 2
- */
- public String getNamespaceURI() {
- return null;
- }
-
- /**
- * getNextSibling method comment.
- */
- public Node getNextSibling() {
- return null;
- }
-
- /**
- * getNodeName method comment.
- */
- public String getNodeName() {
- return fNodeName;
- }
-
- /**
- * getNodeType method comment.
- */
- public short getNodeType() {
- return (short) 0;
- }
-
- /**
- * getNodeValue method comment.
- */
- public String getNodeValue() throws DOMException {
- return "NodeValue";
- }
-
- /**
- * getOwnerDocument method comment.
- */
- public Document getOwnerDocument() {
- return null;
- }
-
- /**
- * getParentNode method comment.
- */
- public Node getParentNode() {
- return null;
- }
-
- /**
- * The namespace prefix of this node, or <code>null</code> if it is
- * unspecified. <br>
- * Note that setting this attribute, when permitted, changes the
- * <code>nodeName</code> attribute, which holds the qualified name, as
- * well as the <code>tagName</code> and <code>name</code> attributes
- * of the <code>Element</code> and <code>Attr</code> interfaces, when
- * applicable. <br>
- * Note also that changing the prefix of an attribute that is known to
- * have a default value, does not make a new attribute with the default
- * value and the original prefix appear, since the
- * <code>namespaceURI</code> and <code>localName</code> do not change.
- * <br>
- * For nodes of any type other than <code>ELEMENT_NODE</code> and
- * <code>ATTRIBUTE_NODE</code> and nodes created with a DOM Level 1
- * method, such as <code>createElement</code> from the
- * <code>Document</code> interface, this is always <code>null</code>.
- *
- * @exception DOMException
- * INVALID_CHARACTER_ERR: Raised if the specified prefix
- * contains an illegal character. <br>
- * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is
- * readonly. <br>
- * NAMESPACE_ERR: Raised if the specified
- * <code>prefix</code> is malformed, if the
- * <code>namespaceURI</code> of this node is
- * <code>null</code>, if the specified prefix is "xml"
- * and the <code>namespaceURI</code> of this node is
- * different from " http://www.w3.org/XML/1998/namespace",
- * if this node is an attribute and the specified prefix is
- * "xmlns" and the <code>namespaceURI</code> of this node
- * is different from " http://www.w3.org/2000/xmlns/", or
- * if this node is an attribute and the
- * <code>qualifiedName</code> of this node is "xmlns" .
- * @ link DOM Level 2
- */
- public String getPrefix() {
- return null;
- }
-
- /**
- * getPreviousSibling method comment.
- */
- public Node getPreviousSibling() {
- return null;
- }
-
- /**
- * Returns whether this node (if it is an element) has any attributes.
- *
- * @return <code>true</code> if this node has any attributes,
- * <code>false</code> otherwise.
- * @ link DOM Level 2
- */
- public boolean hasAttributes() {
- return false;
- }
-
- /**
- * hasChildNodes method comment.
- */
- public boolean hasChildNodes() {
- return false;
- }
-
- /**
- * insertBefore method comment.
- */
- public Node insertBefore(Node newChild, Node refChild) throws DOMException {
- return null;
- }
-
- /**
- * Tests whether the DOM implementation implements a specific feature and
- * that feature is supported by this node.
- *
- * @param featureThe
- * name of the feature to test. This is the same name which can
- * be passed to the method <code>hasFeature</code> on
- * <code>DOMImplementation</code>.
- * @param versionThis
- * is the version number of the feature to test. In Level 2,
- * version 1, this is the string "2.0". If the version is not
- * specified, supporting any version of the feature will cause
- * the method to return <code>true</code>.
- * @return Returns <code>true</code> if the specified feature is
- * supported on this node, <code>false</code> otherwise.
- * @ link DOM Level 2
- */
- public boolean isSupported(String feature, String version) {
- return false;
- }
-
- /**
- * Puts all <code>Text</code> nodes in the full depth of the sub-tree
- * underneath this <code>Node</code>, including attribute nodes, into a
- * "normal" form where only structure (e.g., elements, comments,
- * processing instructions, CDATA sections, and entity references)
- * separates <code>Text</code> nodes, i.e., there are neither adjacent
- * <code>Text</code> nodes nor empty <code>Text</code> nodes. This can
- * be used to ensure that the DOM view of a document is the same as if it
- * were saved and re-loaded, and is useful when operations (such as
- * XPointer lookups) that depend on a particular document tree structure
- * are to be used.In cases where the document contains
- * <code>CDATASections</code>, the normalize operation alone may not be
- * sufficient, since XPointers do not differentiate between
- * <code>Text</code> nodes and <code>CDATASection</code> nodes.
- *
- * @version DOM Level 2
- */
- public void normalize() {
- }
-
- /**
- * removeChild method comment.
- */
- public Node removeChild(Node oldChild) throws DOMException {
- return null;
- }
-
- /**
- * replaceChild method comment.
- */
- public Node replaceChild(Node newChild, Node oldChild) throws DOMException {
- return null;
- }
-
- /**
- * setNodeValue method comment.
- */
- public void setNodeValue(String nodeValue) throws DOMException {
- }
-
- /**
- * setPrefix method comment.
- */
- public void setPrefix(String prefix) throws DOMException {
- }
-
- public String toString() {
- return getNodeName();
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public short compareDocumentPosition(Node other) throws DOMException {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public String getBaseURI() {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public Object getFeature(String feature, String version) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public String getTextContent() throws DOMException {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public Object getUserData(String key) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public boolean isDefaultNamespace(String namespaceURI) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public boolean isEqualNode(Node arg) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public boolean isSameNode(Node other) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public String lookupNamespaceURI(String prefix) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public String lookupPrefix(String namespaceURI) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public void setTextContent(String textContent) throws DOMException {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public Object setUserData(String key, Object data, UserDataHandler handler) {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public TypeInfo getSchemaTypeInfo() {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
- /**
- * NOT IMPLEMENTED, is defined here in preparation of DOM Level 3
- */
- public boolean isId() {
- throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Not implemented in this version.");
- }
-
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
deleted file mode 100644
index 63ade961c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StructuredDocumentToDOMUnitTests.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.jst.jsp.ui.tests.Logger;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class StructuredDocumentToDOMUnitTests implements IStructuredDocumentListener {
- public StructuredDocumentToDOMUnitTests() {
- super();
- }
-
- String getTestString1() {
- return "<a>a<b />b</a>"; // -> <a>ab</a>;
- }
-
- String getTestString2() {
- return "<menu>\n<rname>\nLiam's Chowder House and Grill\n</rname>\n</menu>";
- }
-
- String getTestString3() {
- // return " <?xml version=\"1.0\" ?>\n
- // <testTopSibling><p>text</p></testTopSibling>";
- return "<test/>\n\n <html>\n</html>";
- }
-
- String getTestString4() {
- return "<?xml version=\"1.0\" ?>";
- }
-
- /**
- *
- * @param args
- * java.lang.String[]
- */
- public static void main(String[] args) {
-
- try {
- StructuredDocumentToDOMUnitTests instance = new StructuredDocumentToDOMUnitTests();
- instance.testNodeDeletion4();
- }
- catch (Exception t) {
- t.printStackTrace();
- }
- }
-
- void makeChange1(IDOMModel tree) {
-
- //
- // pick a parent and ones of its children to delete
- // (note: validity of this code is highly dependent on input string)
- org.w3c.dom.Document dom = tree.getDocument();
- NodeList nodes = dom.getChildNodes();
- //
- /*
- * for "first" test case Node testParentNode = nodes.item(0); Node
- * testChildNode = testParentNode.getFirstChild();
- */
- // for "second" test case
- Node testParentNode = nodes.item(0);
- Node testChildNode = testParentNode.getFirstChild();
- testChildNode = testChildNode.getNextSibling();
-
- testParentNode.removeChild(testChildNode);
-
- }
-
- void makeChange2(IStructuredDocument structuredDocument) {
-
- // delete the apostrope in test string // 4, 4?
- structuredDocument.replaceText(this, 19, 1, null);
- }
-
- void makeChange3(IDOMModel tree) {
-
- //
- // pick a parent and ones of its children to delete
- // (note: validity of this code is highly dependent on input string)
- org.w3c.dom.Document dom = tree.getDocument();
- // NodeList nodes = dom.getChildNodes();
- //
- Node testChildNode = dom.getLastChild();
-
- dom.removeChild(testChildNode);
-
- }
-
- /**
- * newModel method comment.
- */
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- System.out.println("newModel:");
- }
-
- /**
- * noChange method comment.
- */
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- // log for now, unless we find reason not to
- Logger.log(Logger.INFO, "StructuredDocumentToDOMUnitTests::noChange needs to be implemented");
- }
-
- /**
- * nodesReplaced method comment.
- */
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- System.out.println("nodesReplaced:");
- System.out.println("\tNewFlatNodes:");
- IStructuredDocumentRegionList flatNodeList = structuredDocumentEvent.getNewStructuredDocumentRegions();
- int len = flatNodeList.getLength();
- for (int i = 0; i < len; i++) {
- String outString = flatNodeList.item(i).toString();
- outString = StringUtils.escape(outString);
- System.out.println("\t\t" + outString);
- }
- System.out.println("\tOldFlatNodes:");
- flatNodeList = structuredDocumentEvent.getOldStructuredDocumentRegions();
- len = flatNodeList.getLength();
- for (int i = 0; i < len; i++) {
- String outString = flatNodeList.item(i).toString();
- outString = StringUtils.escape(outString);
- System.out.println("\t\t" + outString);
- }
- }
-
- /**
- * regionChanged method comment.
- */
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- System.out.println("regionChanged:");
- }
-
- /**
- * regionsReplaced method comment.
- */
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- System.out.println("regionsReplaced:");
- }
-
- /**
- * Unit test -- tests basic parsing results of inserting a test string
- * into an initial string.
- */
- void testNodeDeletion() {
- // String initialString =
- // "<par><x>\ntextx\n</x>\n<y>\ntexty\n</y></par>";
- // String initialString = "<par><x>textx</x><y>texty</y></par>";
- // test cases for two text nodes left together (remove <b/>):
- // first case works, second doesn't
- // String initialString = "<a>a<b /></a>"; // -> <a>a</a>
- // String initialString = "<a>a<b />b</a>"; // -> <a>ab</a>
- // String initialString = getTestString1();
- String initialString = getTestString2();
-
- // print out what we always can
- System.out.println();
- System.out.println("----------------");
- System.out.println("Test Node Deletion");
- String outString = StringUtils.escape(initialString);
- System.out.println("Initial String: " + outString);
- // always start with fresh model
- IStructuredDocument f = null;
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
-
-
- //
- // we'll listen to structuredDocument events to print out diagnostics
- f.addDocumentChangedListener(this);
- //
-
- IDOMModel tree = new DOMModelImpl();
- f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
- // set text to structuredDocument (which updates tree)
- f.setText(null, initialString);
-
- // dump initial structuredDocument
- Debug.dump(f);
- // dump initial dom
- DebugDocument.dump(tree.getDocument());
- //
- //
- // makeChange1(tree);
- makeChange2(f);
-
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- }
-
- /**
- * Unit test -- tests basic parsing results of inserting a test string
- * into an initial string.
- */
- void testNodeDeletion3() {
- String initialString = getTestString3();
-
- // print out what we always can
- System.out.println();
- System.out.println("----------------");
- System.out.println("Test Node Deletion");
- String outString = StringUtils.escape(initialString);
- System.out.println("Initial String: " + outString);
- // always start with fresh model
- IStructuredDocument f = null;
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- //
- // we'll listen to structuredDocument events to print out diagnostics
- f.addDocumentChangedListener(this);
- //
-
- IDOMModel tree = new DOMModelImpl();
- f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
- // set text to structuredDocument (which updates tree)
- f.setText(null, initialString);
-
- // dump initial structuredDocument
- Debug.dump(f);
- // dump initial dom
- DebugDocument.dump(tree.getDocument());
- //
- //
- // makeChange1(tree);
- makeChange3(tree);
-
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- }
-
- /**
- * Unit test -- test insert followed by delete at beginning of string.
- */
- void testNodeDeletion4() {
- String initialString = getTestString4();
-
- // print out what we always can
- System.out.println();
- System.out.println("----------------");
- System.out.println("Test Node Insert and Delete");
- String outString = StringUtils.escape(initialString);
- System.out.println("Initial String: " + outString);
- // always start with fresh model
- IStructuredDocument f = null;
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- f = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- //
- // we'll listen to structuredDocument events to print out diagnostics
- f.addDocumentChangedListener(this);
- //
-
- IDOMModel tree = new DOMModelImpl();
- f.addDocumentChangingListener((IStructuredDocumentListener) tree);
-
- // set text to structuredDocument (which updates tree)
- f.setText(null, initialString);
-
- // dump initial structuredDocument
- Debug.dump(f);
- // dump initial dom
- DebugDocument.dump(tree.getDocument());
- //
- //
- f.replaceText(null, 0, 0, "a");
-
- System.out.println(" ==== Results after insert");
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- f.replaceText(null, 0, 1, "");
-
- System.out.println(" ==== Results after delete");
- // display resulting text
- System.out.println("resultString (from structuredDocument): ");
- System.out.println(StringUtils.escape(f.getText()));
- //
- //
- // dump post change structuredDocument
- Debug.dump(f);
- // dump post change DOM
- DebugDocument.dump(tree.getDocument());
-
- //
-
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
deleted file mode 100644
index 3aa6e0cd8..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextContentSpec.java
+++ /dev/null
@@ -1,951 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-/**
- * Use this test class to validate an implementation of the StyledTextContent
- * interface. To perform the validation, copy this class to the package where
- * your StyledTextContent implementation lives. Then specify the fully
- * qualified name of your StyledTextContent class as an argument to the main
- * method of this class.
- *
- * NOTE: This test class assumes that your StyledTextContent implementation
- * handles the following delimiters:
- * /r /n /r/n
- *
- */
-// This class comes courtesy of Lynne Kues. Our StyledTextContent fails test
-// cases 6x of
-// "Special cases" since we (nor JFace) handle insertion between CR and LF. A
-// minor modification
-// was needed to getContentInstance for out version of StyleTextContent
-// (StructuredDocumentToTextAdapter).
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.custom.StyledTextContent;
-import org.eclipse.swt.custom.TextChangeListener;
-import org.eclipse.swt.custom.TextChangedEvent;
-import org.eclipse.swt.custom.TextChangingEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.StructuredDocumentToTextAdapter;
-
-public class StyledTextContentSpec implements TextChangeListener {
- static String contentClassName;
- static int failCount = 0;
- static int errorCount = 0;
- Class contentClass = null;
- StyledTextContent contentInstance = null;
- int verify = 0;
- Method currentMethod = null;
- boolean failed = false;
- StyledText widget = null;
- Shell shell = null;
-
- public StyledTextContentSpec() {
- }
-
- public void assertWithMessage(String message, boolean condition) {
- System.out.print("\t" + currentMethod.getName() + " " + message);
- if (!condition)
- fail(message);
- else
- System.out.println(" passed");
- }
-
- public void fail(String message) {
- failed = true;
- System.out.println(" FAILED");
- failCount++;
- }
-
- public StyledTextContent getContentInstance() {
- contentInstance.setText("");
- widget.setContent(contentInstance);
- // dw. Had to add for our special version of StyledTextContent
- // Needs to be removed for testing jface's DocumentAdapter
- ((StructuredDocumentToTextAdapter) contentInstance).setWidget(widget);
- return contentInstance;
- }
-
- public static String getTestText() {
- return "This is the first line.\r\n" + "This is the second line.\r\n" + "This is the third line.\r\n" + "This is the fourth line.\r\n" + "This is the fifth line.\r\n" + "\r\n" + "This is the first line again.\r\n" + "This is the second line again.\r\n" + "This is the third line again.\r\n" + "This is the fourth line again.\r\n" + "This is the fifth line again.\r\n" + "\r\n" + "This is the first line once again.\r\n" + "This is the second line once again.\r\n" + "This is the third line once again.\r\n" + "This is the fourth line once again.\r\n" + "This is the fifth line once again.";
- }
-
- public static void main(String[] args) {
- StyledTextContentSpec spec = new StyledTextContentSpec();
- if (args.length > 0) {
- contentClassName = args[0];
- //String path = System.getProperty("java.library.path");
- //System.out.println("Java Library Path: " + path);
- }
- else {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
- box.open();
- return;
- }
- spec.run();
- System.out.println();
- System.out.println(failCount + " TEST FAILURES.");
- System.out.println(errorCount + " UNEXPECTED ERRORS.");
- }
-
- static private Display getDisplay() {
- return PlatformUI.getWorkbench().getDisplay();
- }
-
- public void run() {
- if (contentClassName.equals("")) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
- box.open();
- return;
- }
- if (contentClass == null) {
- try {
- contentClass = Class.forName(contentClassName);
- }
- catch (ClassNotFoundException e) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Content class:\n" + contentClassName + "\nnot found"); //$NON-NLS-1$
- box.open();
- return;
- }
- }
- try {
- contentInstance = (StyledTextContent) contentClass.newInstance();
- }
- catch (IllegalAccessException e) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Unable to access content class:\n" + contentClassName); //$NON-NLS-1$
- box.open();
- return;
- }
- catch (InstantiationException e) {
- MessageBox box = new MessageBox(getDisplay().getActiveShell(), SWT.ICON_ERROR);
- box.setMessage("Unable to instantiate content class:\n" + contentClassName); //$NON-NLS-1$
- box.open();
- return;
- }
- Class clazz;
- clazz = this.getClass();
- Method[] methods = clazz.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- setUp();
- currentMethod = methods[i];
- failed = false;
- try {
- if (currentMethod.getName().startsWith("test_")) {
- System.out.println();
- System.out.println(currentMethod.getName() + "...");
- currentMethod.invoke(this, new Object[0]);
- if (!failed) {
- System.out.println("PASSED.");
- }
- else {
- System.out.println("FAILED");
- }
- }
- }
- catch (InvocationTargetException ex) {
- System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.getTargetException().toString());
- System.out.println("FAILED");
- errorCount++;
- }
- catch (Exception ex) {
- System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.toString());
- System.out.println("FAILED");
- errorCount++;
- }
- if (verify != 0) {
- verify = 0;
- contentInstance.removeTextChangeListener(this);
- }
- tearDown();
- }
- }
-
- protected void setUp() {
- // create shell
- shell = new Shell();
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- shell.setSize(500, 300);
- shell.setLayout(layout);
- // create widget
- widget = new StyledText(shell, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
- GridData spec = new GridData();
- spec.horizontalAlignment = GridData.FILL;
- spec.grabExcessHorizontalSpace = true;
- spec.verticalAlignment = GridData.FILL;
- spec.grabExcessVerticalSpace = true;
- widget.setLayoutData(spec);
- shell.open();
- }
-
- protected void tearDown() {
- if (shell != null && !shell.isDisposed())
- shell.dispose();
- shell = null;
- }
-
- public void test_Delete() {
- StyledTextContent content = getContentInstance();
- String newText;
- content.setText("This\nis a test\r");
- content.replaceTextRange(6, 2, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":1a:", newText.equals("This\nia test\r"));
- assertWithMessage(":1b:", content.getLine(0).equals("This"));
- assertWithMessage(":1c:", content.getLine(1).equals("ia test"));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 9, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("This\n\r"));
- assertWithMessage(":2b:", content.getLineCount() == 3);
- assertWithMessage(":2c:", content.getLine(0).equals("This"));
- assertWithMessage(":2d:", content.getLine(1).equals(""));
- assertWithMessage(":2e:", content.getLine(2).equals(""));
- content.setText("This\nis a test\nline 3\nline 4");
- content.replaceTextRange(21, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("This\nis a test\nline 3"));
- assertWithMessage(":3b:", content.getLineCount() == 3);
- assertWithMessage(":3c:", content.getLine(0).equals("This"));
- assertWithMessage(":3d:", content.getLine(1).equals("is a test"));
- assertWithMessage(":3e:", content.getLine(2).equals("line 3"));
- content.setText("This\nis a test\nline 3\nline 4");
- content.replaceTextRange(0, 5, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("is a test\nline 3\nline 4"));
- assertWithMessage(":4b:", content.getLineCount() == 3);
- assertWithMessage(":4c:", content.getLine(0).equals("is a test"));
- assertWithMessage(":4d:", content.getLine(1).equals("line 3"));
- assertWithMessage(":4e:", content.getLine(2).equals("line 4"));
- content.replaceTextRange(16, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4f:", newText.equals("is a test\nline 3"));
- assertWithMessage(":4g:", content.getLine(0).equals("is a test"));
- assertWithMessage(":4h:", content.getLine(1).equals("line 3"));
- content.replaceTextRange(9, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4i:", newText.equals("is a test"));
- assertWithMessage(":4j:", content.getLine(0).equals("is a test"));
- content.replaceTextRange(1, 8, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4k:", newText.equals("i"));
- assertWithMessage(":4l:", content.getLine(0).equals("i"));
- content.replaceTextRange(0, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4m:", newText.equals(""));
- assertWithMessage(":4n:", content.getLine(0).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 9, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", newText.equals("This\n\r"));
- assertWithMessage(":5b:", content.getLineCount() == 3);
- assertWithMessage(":5c:", content.getLine(0).equals("This"));
- assertWithMessage(":5d:", content.getLine(1).equals(""));
- assertWithMessage(":5e:", content.getLine(2).equals(""));
- content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
- content.replaceTextRange(4, 8, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":6a:", newText.equals("L1\r\nL4\r\n"));
- assertWithMessage(":6b:", content.getLineCount() == 3);
- assertWithMessage(":6c:", content.getLine(0).equals("L1"));
- assertWithMessage(":6d:", content.getLine(1).equals("L4"));
- assertWithMessage(":6e:", content.getLine(2).equals(""));
- content.setText("\nL1\r\nL2");
- content.replaceTextRange(0, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7a:", newText.equals("L1\r\nL2"));
- assertWithMessage(":7b:", content.getLineCount() == 2);
- assertWithMessage(":7c:", content.getLine(0).equals("L1"));
- assertWithMessage(":7d:", content.getLine(1).equals("L2"));
- content.setText("\nL1\r\nL2\r\n");
- content.replaceTextRange(7, 2, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8a:", newText.equals("\nL1\r\nL2"));
- assertWithMessage(":8b:", content.getLineCount() == 3);
- assertWithMessage(":8c:", content.getLine(0).equals(""));
- assertWithMessage(":8d:", content.getLine(1).equals("L1"));
- assertWithMessage(":8e:", content.getLine(2).equals("L2"));
- content.setText("\nLine 1\nLine 2\n");
- content.replaceTextRange(0, 7, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":9a:", newText.equals("\nLine 2\n"));
- assertWithMessage(":9b:", content.getLineCount() == 3);
- assertWithMessage(":9c:", content.getLine(0).equals(""));
- assertWithMessage(":9d:", content.getLine(1).equals("Line 2"));
- assertWithMessage(":9e:", content.getLine(2).equals(""));
- content.setText("Line 1\nLine 2\n");
- content.replaceTextRange(6, 8, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":10a:", newText.equals("Line 1"));
- assertWithMessage(":10b:", content.getLineCount() == 1);
- assertWithMessage(":10c:", content.getLine(0).equals("Line 1"));
- content.setText("Line one is short\r\nLine 2 is a longer line\r\nLine 3\n");
- content.replaceTextRange(12, 17, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));
- assertWithMessage(":11b:", content.getLineCount() == 3);
- assertWithMessage(":11c:", content.getLine(0).equals("Line one is a longer line"));
- assertWithMessage(":11d:", content.getLine(1).equals("Line 3"));
- assertWithMessage(":11e:", content.getLine(2).equals(""));
- }
-
- public void test_Empty() {
- StyledTextContent content = getContentInstance();
- assertWithMessage(":1a:", content.getLineCount() == 1);
- assertWithMessage(":1b:", content.getLine(0).equals(""));
- content.setText("test");
- content.replaceTextRange(0, 4, "");
- assertWithMessage(":2a:", content.getLineCount() == 1);
- assertWithMessage(":2b:", content.getLine(0).equals(""));
- }
-
- public void test_Insert() {
- StyledTextContent content = getContentInstance();
- String newText;
- content.setText("This\nis a test\r");
- content.replaceTextRange(0, 0, "test\n ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":1a:", newText.equals("test\n This\nis a test\r"));
- assertWithMessage(":1b:", content.getLineCount() == 4);
- assertWithMessage(":1c:", content.getLine(0).equals("test"));
- assertWithMessage(":1d:", content.getLine(1).equals(" This"));
- assertWithMessage(":1e:", content.getLine(2).equals("is a test"));
- assertWithMessage(":1f:", content.getLine(3).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 0, "*** ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("This\n*** is a test\r"));
- assertWithMessage(":2b:", content.getLineCount() == 3);
- assertWithMessage(":2c:", content.getLine(0).equals("This"));
- assertWithMessage(":2d:", content.getLine(1).equals("*** is a test"));
- assertWithMessage(":2e:", content.getLine(2).equals(""));
- content.setText("Line 1\r\nLine 2");
- content.replaceTextRange(0, 0, "\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("\rLine 1\r\nLine 2"));
- assertWithMessage(":3b:", content.getLineCount() == 3);
- assertWithMessage(":3c:", content.getLine(0).equals(""));
- assertWithMessage(":3d:", content.getLine(1).equals("Line 1"));
- assertWithMessage(":3e:", content.getLine(2).equals("Line 2"));
- content.replaceTextRange(9, 0, "\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));
- assertWithMessage(":3g:", content.getLineCount() == 4);
- assertWithMessage(":3h:", content.getLine(0).equals(""));
- assertWithMessage(":3i:", content.getLine(1).equals("Line 1"));
- assertWithMessage(":3j:", content.getLine(2).equals(""));
- assertWithMessage(":3k:", content.getLine(3).equals("Line 2"));
- content.setText("This\nis a test\r");
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("\nThis\nis a test\r"));
- assertWithMessage(":4b:", content.getLineCount() == 4);
- assertWithMessage(":4c:", content.getLine(0).equals(""));
- assertWithMessage(":4d:", content.getLine(1).equals("This"));
- assertWithMessage(":4e:", content.getLine(2).equals("is a test"));
- assertWithMessage(":4f:", content.getLine(3).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(7, 0, "\r\nnewLine");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));
- assertWithMessage(":5b:", content.getLineCount() == 4);
- assertWithMessage(":5c:", content.getLine(0).equals("This"));
- assertWithMessage(":5d:", content.getLine(1).equals("is"));
- assertWithMessage(":5e:", content.getLine(2).equals("newLine a test"));
- assertWithMessage(":5f:", content.getLine(3).equals(""));
- content.setText("");
- content.replaceTextRange(0, 0, "This\nis\r\nnewLine a test\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));
- assertWithMessage(":6b:", content.getLineCount() == 4);
- assertWithMessage(":6c:", content.getLine(0).equals("This"));
- assertWithMessage(":6d:", content.getLine(1).equals("is"));
- assertWithMessage(":6e:", content.getLine(2).equals("newLine a test"));
- assertWithMessage(":6f:", content.getLine(3).equals(""));
- // insert at end
- content.setText("This");
- content.replaceTextRange(4, 0, "\n ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7a:", newText.equals("This\n "));
- assertWithMessage(":7b:", content.getLineCount() == 2);
- assertWithMessage(":7c:", content.getLine(0).equals("This"));
- assertWithMessage(":7d:", content.getLine(1).equals(" "));
- content.setText("This\n");
- content.replaceTextRange(5, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7e:", newText.equals("This\n\n"));
- assertWithMessage(":7f:", content.getLineCount() == 3);
- assertWithMessage(":7g:", content.getLine(0).equals("This"));
- assertWithMessage(":7h:", content.getLine(1).equals(""));
- assertWithMessage(":7i:", content.getLine(2).equals(""));
- // insert at beginning
- content.setText("This");
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8a:", newText.equals("\nThis"));
- assertWithMessage(":8b:", content.getLineCount() == 2);
- assertWithMessage(":8c:", content.getLine(0).equals(""));
- assertWithMessage(":8d:", content.getLine(1).equals("This"));
- // insert text
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 0, "*** ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":9a:", newText.equals("This\n*** is a test\r"));
- assertWithMessage(":9b:", content.getLineCount() == 3);
- assertWithMessage(":9c:", content.getLine(0).equals("This"));
- assertWithMessage(":9d:", content.getLine(1).equals("*** is a test"));
- assertWithMessage(":9e:", content.getLine(2).equals(""));
- content.setText("This\n");
- content.replaceTextRange(5, 0, "line");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":10a:", newText.equals("This\nline"));
- assertWithMessage(":10b:", content.getLineCount() == 2);
- assertWithMessage(":10c:", content.getLine(0).equals("This"));
- assertWithMessage(":10d:", content.getLine(1).equals("line"));
- assertWithMessage(":10e:", content.getLineAtOffset(8) == 1);
- assertWithMessage(":10f:", content.getLineAtOffset(9) == 1);
- // insert at beginning
- content.setText("This\n");
- content.replaceTextRange(0, 0, "line\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":11a:", newText.equals("line\nThis\n"));
- assertWithMessage(":11b:", content.getLineCount() == 3);
- assertWithMessage(":11c:", content.getLine(0).equals("line"));
- assertWithMessage(":11d:", content.getLine(1).equals("This"));
- assertWithMessage(":11e:", content.getLineAtOffset(5) == 1);
- content.setText("Line 1\r\nLine 2\r\nLine 3");
- content.replaceTextRange(0, 0, "\r");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));
- assertWithMessage(":12b:", content.getLineCount() == 4);
- assertWithMessage(":12c:", content.getLine(0).equals(""));
- assertWithMessage(":12d:", content.getLine(1).equals("Line 1"));
- assertWithMessage(":12e:", content.getLine(2).equals("Line 2"));
- assertWithMessage(":12f:", content.getLine(3).equals("Line 3"));
- content.setText("Line 1\nLine 2\nLine 3");
- content.replaceTextRange(7, 0, "Line1a\nLine1b\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));
- assertWithMessage(":13b:", content.getLineCount() == 5);
- assertWithMessage(":13c:", content.getLine(0).equals("Line 1"));
- assertWithMessage(":13d:", content.getLine(1).equals("Line1a"));
- assertWithMessage(":13e:", content.getLine(2).equals("Line1b"));
- assertWithMessage(":13f:", content.getLine(3).equals("Line 2"));
- assertWithMessage(":13g:", content.getLine(4).equals("Line 3"));
- content.setText("Line 1\nLine 2\nLine 3");
- content.replaceTextRange(11, 0, "l1a");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));
- assertWithMessage(":14b:", content.getLineCount() == 3);
- assertWithMessage(":14c:", content.getLine(0).equals("Line 1"));
- assertWithMessage(":14d:", content.getLine(1).equals("Linel1a 2"));
- assertWithMessage(":14e:", content.getLine(2).equals("Line 3"));
- content.setText("Line 1\nLine 2 is a very long line that spans many words\nLine 3");
- content.replaceTextRange(19, 0, "very, very, ");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));
- assertWithMessage(":15b:", content.getLineCount() == 3);
- assertWithMessage(":15c:", content.getLine(0).equals("Line 1"));
- assertWithMessage(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));
- assertWithMessage(":15e:", content.getLine(2).equals("Line 3"));
- }
-
- public void test_Line_Conversion() {
- StyledTextContent content = getContentInstance();
- content.setText("This\nis a test\rrepeat\nend\r");
- assertWithMessage(":1a:", content.getLineCount() == 5);
- assertWithMessage(":1b:", content.getLine(0).equals("This"));
- assertWithMessage(":1c:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":1d:", content.getLine(1).equals("is a test"));
- assertWithMessage(":1e:", content.getLineAtOffset(4) == 0);
- assertWithMessage(":1f:", content.getOffsetAtLine(1) == 5);
- assertWithMessage(":1g:", content.getLine(2).equals("repeat"));
- assertWithMessage(":1h:", content.getOffsetAtLine(2) == 15);
- assertWithMessage(":1i:", content.getLine(3).equals("end"));
- assertWithMessage(":1j:", content.getOffsetAtLine(3) == 22);
- assertWithMessage(":1k:", content.getLine(4).equals(""));
- assertWithMessage(":1l:", content.getOffsetAtLine(4) == 26);
- content.setText("This\r\nis a test");
- assertWithMessage(":2a:", content.getLineCount() == 2);
- assertWithMessage(":2b:", content.getLine(1).equals("is a test"));
- assertWithMessage(":2c:", content.getLineAtOffset(4) == 0);
- assertWithMessage(":2d:", content.getLineAtOffset(5) == 0);
- content.setText("This\r\nis a test\r");
- assertWithMessage(":3a:", content.getLineCount() == 3);
- assertWithMessage(":3b:", content.getLine(1).equals("is a test"));
- assertWithMessage(":3c:", content.getLineAtOffset(15) == 1);
- content.setText("\r\n");
- assertWithMessage(":4a:", content.getLineCount() == 2);
- assertWithMessage(":4b:", content.getLine(0).equals(""));
- assertWithMessage(":4c:", content.getLine(1).equals(""));
- assertWithMessage(":4d:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":4e:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":4f:", content.getLineAtOffset(2) == 1);
- content.setText("\r\n\n\r\r\n");
- assertWithMessage(":5a:", content.getLineCount() == 5);
- assertWithMessage(":5b:", content.getLine(0).equals(""));
- assertWithMessage(":5c:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":5d:", content.getLine(1).equals(""));
- assertWithMessage(":5e:", content.getOffsetAtLine(1) == 2);
- assertWithMessage(":5f:", content.getLine(2).equals(""));
- assertWithMessage(":5g:", content.getOffsetAtLine(2) == 3);
- assertWithMessage(":5h:", content.getLine(3).equals(""));
- assertWithMessage(":5i:", content.getOffsetAtLine(3) == 4);
- assertWithMessage(":5j:", content.getLine(4).equals(""));
- assertWithMessage(":5k:", content.getOffsetAtLine(4) == 6);
- content.setText("test\r\rtest2\r\r");
- assertWithMessage(":6a:", content.getLineCount() == 5);
- assertWithMessage(":6b:", content.getLine(0).equals("test"));
- assertWithMessage(":6c:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":6d:", content.getLine(1).equals(""));
- assertWithMessage(":6e:", content.getOffsetAtLine(1) == 5);
- assertWithMessage(":6f:", content.getLine(2).equals("test2"));
- assertWithMessage(":6g:", content.getOffsetAtLine(2) == 6);
- assertWithMessage(":6h:", content.getLine(3).equals(""));
- assertWithMessage(":6i:", content.getOffsetAtLine(3) == 12);
- assertWithMessage(":6j:", content.getLine(4).equals(""));
- assertWithMessage(":6k:", content.getOffsetAtLine(4) == 13);
- }
-
- public void test_Line_To_Offset() {
- StyledTextContent content = getContentInstance();
- content.setText("This\nis a test\rrepeat\nend\r");
- assertWithMessage(":1a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":1b:", content.getOffsetAtLine(1) == 5);
- assertWithMessage(":1c:", content.getOffsetAtLine(2) == 15);
- assertWithMessage(":1d:", content.getOffsetAtLine(3) == 22);
- assertWithMessage(":1e:", content.getOffsetAtLine(4) == 26);
- content.setText("This\r\nis a test");
- assertWithMessage(":2a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":2b:", content.getOffsetAtLine(1) == 6);
- content.setText("\r\n");
- assertWithMessage(":3a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":3b:", content.getOffsetAtLine(1) == 2);
- content.setText("\r\n\n\r\r\n");
- assertWithMessage(":4a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":4b:", content.getOffsetAtLine(1) == 2);
- assertWithMessage(":4c:", content.getOffsetAtLine(2) == 3);
- assertWithMessage(":4d:", content.getOffsetAtLine(3) == 4);
- assertWithMessage(":4e:", content.getOffsetAtLine(4) == 6);
- content.setText("\r\ntest\r\n");
- assertWithMessage(":5a:", content.getOffsetAtLine(0) == 0);
- assertWithMessage(":5b:", content.getOffsetAtLine(1) == 2);
- assertWithMessage(":5c:", content.getOffsetAtLine(2) == 8);
- }
-
- public void test_Offset_To_Line() {
- StyledTextContent content = getContentInstance();
- content.setText("This\nis a test\rrepeat\nend\r");
- assertWithMessage(":1a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":1b:", content.getLineAtOffset(3) == 0);
- assertWithMessage(":1c:", content.getLineAtOffset(4) == 0);
- assertWithMessage(":1d:", content.getLineAtOffset(25) == 3);
- assertWithMessage(":1e:", content.getLineAtOffset(26) == 4);
- content.setText("This\r\nis a test");
- assertWithMessage(":2a:", content.getLineAtOffset(5) == 0);
- assertWithMessage(":2b:", content.getLineAtOffset(6) == 1);
- assertWithMessage(":2c:", content.getLineAtOffset(10) == 1);
- content.setText("\r\n");
- assertWithMessage(":3a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":3b:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":3c:", content.getLineAtOffset(2) == 1);
- content.setText("\r\n\n\r\r\n");
- assertWithMessage(":4a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":4b:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":4c:", content.getLineAtOffset(2) == 1);
- assertWithMessage(":4d:", content.getLineAtOffset(3) == 2);
- assertWithMessage(":4e:", content.getLineAtOffset(4) == 3);
- assertWithMessage(":4f:", content.getLineAtOffset(5) == 3);
- assertWithMessage(":4g:", content.getLineAtOffset(6) == 4);
- content.setText("\r\n\r\n");
- assertWithMessage(":5a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":5b:", content.getLineAtOffset(1) == 0);
- assertWithMessage(":5c:", content.getLineAtOffset(2) == 1);
- assertWithMessage(":5d:", content.getLineAtOffset(3) == 1);
- assertWithMessage(":5e:", content.getLineAtOffset(4) == 2);
- content.setText("\r\r\r\n\r\n");
- assertWithMessage(":6a:", content.getLineAtOffset(0) == 0);
- assertWithMessage(":6b:", content.getLineAtOffset(1) == 1);
- assertWithMessage(":6c:", content.getLineAtOffset(2) == 2);
- assertWithMessage(":6d:", content.getLineAtOffset(4) == 3);
- content.setText("");
- assertWithMessage(":7a:", content.getLineAtOffset(0) == 0);
- content = getContentInstance();
- assertWithMessage(":8a:", content.getLineAtOffset(0) == 0);
- }
-
- public void test_Replace() {
- StyledTextContent content = getContentInstance();
- String newText;
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 4, "a");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":1a:", newText.equals("This\na test\r"));
- assertWithMessage(":1b:", content.getLineCount() == 3);
- assertWithMessage(":1c:", content.getLine(0).equals("This"));
- assertWithMessage(":1d:", content.getLine(1).equals("a test"));
- assertWithMessage(":1e:", content.getLine(2).equals(""));
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 2, "was");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("This\nwas a test\r"));
- assertWithMessage(":2b:", content.getLineCount() == 3);
- assertWithMessage(":2c:", content.getLine(0).equals("This"));
- assertWithMessage(":2d:", content.getLine(1).equals("was a test"));
- assertWithMessage(":2e:", content.getLine(2).equals(""));
- content.setText("This is a test\r");
- content.replaceTextRange(5, 2, "was");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("This was a test\r"));
- assertWithMessage(":3b:", content.getLineCount() == 2);
- assertWithMessage(":3c:", content.getLine(0).equals("This was a test"));
- assertWithMessage(":3d:", content.getLineAtOffset(15) == 0);
- content.setText("Line 1\nLine 2\nLine 3");
- content.replaceTextRange(0, 7, "La\nLb\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));
- assertWithMessage(":4b:", content.getLine(0).equals("La"));
- assertWithMessage(":4c:", content.getLine(1).equals("Lb"));
- assertWithMessage(":4d:", content.getLine(2).equals("Line 2"));
- assertWithMessage(":4e:", content.getLine(3).equals("Line 3"));
- content.setText(getTestText());
- newText = content.getTextRange(0, content.getCharCount());
- int start = content.getOffsetAtLine(6);
- int end = content.getOffsetAtLine(11);
- content.replaceTextRange(start, end - start, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", content.getLineCount() == 12);
- assertWithMessage(":5a:", content.getLine(5).equals(""));
- assertWithMessage(":5a:", content.getLine(6).equals(""));
- start = content.getOffsetAtLine(7);
- content.replaceTextRange(start, content.getCharCount() - start, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", content.getLineCount() == 8);
- assertWithMessage(":5a:", content.getLine(5).equals(""));
- assertWithMessage(":5a:", content.getLine(6).equals(""));
- assertWithMessage(":5a:", content.getLine(7).equals(""));
- }
-
- public void test_Special_Cases() {
- String newText;
- StyledTextContent content = getContentInstance();
- assertWithMessage(":0a:", content.getLineCount() == 1);
- assertWithMessage(":0b:", content.getOffsetAtLine(0) == 0);
- content.setText("This is the input/output text component.");
- content.replaceTextRange(0, 0, "\n");
- assertWithMessage(":1a:", content.getLine(0).equals(""));
- content.replaceTextRange(1, 0, "\n");
- assertWithMessage(":1b:", content.getLine(0).equals(""));
- content.replaceTextRange(2, 0, "\n");
- assertWithMessage(":1c:", content.getLine(0).equals(""));
- content.replaceTextRange(3, 0, "\n");
- assertWithMessage(":1d:", content.getLine(0).equals(""));
- content.replaceTextRange(4, 0, "\n");
- assertWithMessage(":1e:", content.getLine(0).equals(""));
- content.replaceTextRange(5, 0, "\n");
- assertWithMessage(":1f:", content.getLine(0).equals(""));
- content.replaceTextRange(6, 0, "\n");
- assertWithMessage(":1g:", content.getLine(0).equals(""));
- content.replaceTextRange(7, 0, "\n");
- assertWithMessage(":1h:", content.getLine(0).equals(""));
- content.setText("This is the input/output text component.");
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2a:", newText.equals("\nThis is the input/output text component."));
- assertWithMessage(":2b:", content.getLine(0).equals(""));
- assertWithMessage(":2c:", content.getLine(1).equals("This is the input/output text component."));
- content.replaceTextRange(1, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":2d:", newText.equals("\n\nThis is the input/output text component."));
- assertWithMessage(":2e:", content.getLine(0).equals(""));
- assertWithMessage(":2f:", content.getLine(1).equals(""));
- assertWithMessage(":2g:", content.getLine(2).equals("This is the input/output text component."));
- content.replaceTextRange(2, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3a:", newText.equals("\n\n\nThis is the input/output text component."));
- assertWithMessage(":3b:", content.getLine(0).equals(""));
- assertWithMessage(":3c:", content.getLine(1).equals(""));
- assertWithMessage(":3d:", content.getLine(2).equals(""));
- assertWithMessage(":3e:", content.getLine(3).equals("This is the input/output text component."));
- content.replaceTextRange(3, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));
- assertWithMessage(":3g:", content.getLine(0).equals(""));
- assertWithMessage(":3h:", content.getLine(1).equals(""));
- assertWithMessage(":3i:", content.getLine(2).equals(""));
- assertWithMessage(":3j:", content.getLine(3).equals(""));
- assertWithMessage(":3k:", content.getLine(4).equals("This is the input/output text component."));
- content.replaceTextRange(3, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4a:", newText.equals("\n\n\nThis is the input/output text component."));
- assertWithMessage(":4b:", content.getLine(0).equals(""));
- assertWithMessage(":4c:", content.getLine(1).equals(""));
- assertWithMessage(":4d:", content.getLine(2).equals(""));
- assertWithMessage(":4e:", content.getLine(3).equals("This is the input/output text component."));
- content.replaceTextRange(2, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":4f:", newText.equals("\n\nThis is the input/output text component."));
- assertWithMessage(":4g:", content.getLine(0).equals(""));
- assertWithMessage(":4h:", content.getLine(1).equals(""));
- assertWithMessage(":4i:", content.getLine(2).equals("This is the input/output text component."));
- content.replaceTextRange(2, 0, "a");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5a:", newText.equals("\n\naThis is the input/output text component."));
- assertWithMessage(":5b:", content.getLine(0).equals(""));
- assertWithMessage(":5c:", content.getLine(1).equals(""));
- assertWithMessage(":5d:", content.getLine(2).equals("aThis is the input/output text component."));
- // delete only part of a delimiter
- content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
- content.replaceTextRange(0, 3, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":5e:", newText.equals("\nL2\r\nL3\r\nL4\r\n"));
- assertWithMessage(":5f:", content.getLineCount() == 5);
- assertWithMessage(":5g:", content.getLine(0).equals(""));
- assertWithMessage(":5h:", content.getLine(1).equals("L2"));
- assertWithMessage(":5i:", content.getLine(2).equals("L3"));
- assertWithMessage(":5j:", content.getLine(3).equals("L4"));
- assertWithMessage(":5k:", content.getLine(4).equals(""));
- // replace part of a delimiter
- content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
- content.replaceTextRange(3, 1, "test\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":6a:", newText.equals("L1\rtest\nL2\r\nL3\r\nL4\r\n"));
- assertWithMessage(":6b:", content.getLineCount() == 6);
- assertWithMessage(":6c:", content.getLine(0).equals("L1"));
- assertWithMessage(":6d:", content.getLine(1).equals("test"));
- assertWithMessage(":6e:", content.getLine(2).equals("L2"));
- assertWithMessage(":6f:", content.getLine(3).equals("L3"));
- assertWithMessage(":6g:", content.getLine(4).equals("L4"));
- assertWithMessage(":6h:", content.getLine(5).equals(""));
- content.setText("abc\r\ndef");
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7a:", newText.equals("ac\r\ndef"));
- assertWithMessage(":7b:", content.getLineCount() == 2);
- assertWithMessage(":7c:", content.getLine(0).equals("ac"));
- assertWithMessage(":7d:", content.getLine(1).equals("def"));
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7e:", newText.equals("a\r\ndef"));
- assertWithMessage(":7f:", content.getLineCount() == 2);
- assertWithMessage(":7g:", content.getLine(0).equals("a"));
- assertWithMessage(":7h:", content.getLine(1).equals("def"));
- content.replaceTextRange(1, 2, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7i:", newText.equals("adef"));
- assertWithMessage(":7j:", content.getLineCount() == 1);
- assertWithMessage(":7k:", content.getLine(0).equals("adef"));
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7l:", newText.equals("aef"));
- assertWithMessage(":7m:", content.getLineCount() == 1);
- assertWithMessage(":7n:", content.getLine(0).equals("aef"));
- content.replaceTextRange(1, 1, "");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":7o:", newText.equals("af"));
- assertWithMessage(":7p:", content.getLineCount() == 1);
- assertWithMessage(":7q:", content.getLine(0).equals("af"));
- content.setText("abc");
- content.replaceTextRange(0, 1, "1");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8a:", content.getLineCount() == 1);
- assertWithMessage(":8b:", newText.equals("1bc"));
- assertWithMessage(":8c:", content.getLine(0).equals("1bc"));
- content.replaceTextRange(0, 0, "\n");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":8d:", newText.equals("\n1bc"));
- assertWithMessage(":8e:", content.getLineCount() == 2);
- assertWithMessage(":8f:", content.getLine(0).equals(""));
- assertWithMessage(":8g:", content.getLine(1).equals("1bc"));
- content = getContentInstance();
- content.replaceTextRange(0, 0, "a");
- content.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");
- content.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");
- newText = content.getTextRange(0, content.getCharCount());
- assertWithMessage(":9a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));
- assertWithMessage(":9b:", content.getLineCount() == 6);
- assertWithMessage(":9c:", content.getLine(0).equals("package test;"));
- assertWithMessage(":9d:", content.getLine(1).equals("\t/*Line 1"));
- assertWithMessage(":9e:", content.getLine(2).equals("\t * Line 2"));
- assertWithMessage(":9f:", content.getLine(3).equals("\t */"));
- assertWithMessage(":9g:", content.getLine(4).equals("public class SimpleClass {"));
- assertWithMessage(":9h:", content.getLine(5).equals("}"));
- }
-
- public void test_Text_Changed_Event() {
- StyledTextContent content = getContentInstance();
- content.addTextChangeListener(this);
- verify = 1;
- content.setText("testing");
- content.replaceTextRange(0, 0, "\n");
- verify = 2;
- content.setText("\n\n");
- content.replaceTextRange(0, 2, "a");
- verify = 3;
- content.setText("a");
- content.replaceTextRange(0, 1, "\n\n");
- verify = 5;
- content.setText("Line 1\r\nLine 2");
- content.replaceTextRange(0, 0, "\r");
- verify = 6;
- content.setText("This\nis a test\nline 3\nline 4");
- content.replaceTextRange(21, 7, "");
- verify = 7;
- content.setText("This\nis a test\r");
- content.replaceTextRange(5, 9, "");
- verify = 8;
- content.setText("\nL1\r\nL2\r\n");
- content.replaceTextRange(7, 2, "");
- verify = 9;
- content.setText("L1\r\n");
- content.replaceTextRange(2, 2, "test");
- verify = 0;
- content.removeTextChangeListener(this);
- }
-
- public void textChanged(TextChangedEvent event) {
- }
-
- public void textChanging(TextChangingEvent event) {
- switch (verify) {
- case 1 :
- {
- assertWithMessage(":1a:", event.replaceLineCount == 0);
- assertWithMessage(":1b:", event.newLineCount == 1);
- break;
- }
- case 2 :
- {
- assertWithMessage(":2a:", event.replaceLineCount == 2);
- assertWithMessage(":2b:", event.newLineCount == 0);
- break;
- }
- case 3 :
- {
- assertWithMessage(":3a:", event.replaceLineCount == 0);
- assertWithMessage(":3b:", event.newLineCount == 2);
- break;
- }
- case 4 :
- {
- assertWithMessage(":4a:", event.replaceLineCount == 0);
- assertWithMessage(":4b:", event.newLineCount == 1);
- break;
- }
- case 5 :
- {
- assertWithMessage(":5a:", event.replaceLineCount == 0);
- assertWithMessage(":5b:", event.newLineCount == 1);
- break;
- }
- case 6 :
- {
- assertWithMessage(":6a:", event.replaceLineCount == 1);
- assertWithMessage(":6b:", event.newLineCount == 0);
- break;
- }
- case 8 :
- {
- assertWithMessage(":8a:", event.replaceLineCount == 1);
- assertWithMessage(":8b:", event.newLineCount == 0);
- break;
- }
- case 9 :
- {
- assertWithMessage(":9a:", event.replaceLineCount == 1);
- assertWithMessage(":9b:", event.newLineCount == 0);
- break;
- }
- case 10 :
- {
- assertWithMessage(":10a:", event.replaceLineCount == 0);
- assertWithMessage(":10b:", event.newLineCount == 0);
- break;
- }
- case 11 :
- {
- assertWithMessage(":11a:", event.replaceLineCount == 0);
- assertWithMessage(":11b:", event.newLineCount == 0);
- break;
- }
- case 12 :
- {
- assertWithMessage(":12a:", event.replaceLineCount == 0);
- assertWithMessage(":12b:", event.newLineCount == 0);
- break;
- }
- case 13 :
- {
- assertWithMessage(":13a:", event.replaceLineCount == 0);
- assertWithMessage(":13b:", event.newLineCount == 0);
- break;
- }
- case 14 :
- {
- assertWithMessage(":14a:", event.replaceLineCount == 0);
- assertWithMessage(":14b:", event.newLineCount == 1);
- break;
- }
- case 15 :
- {
- assertWithMessage(":15a:", event.replaceLineCount == 1);
- assertWithMessage(":15b:", event.newLineCount == 2);
- break;
- }
- case 16 :
- {
- assertWithMessage(":16a:", event.replaceLineCount == 0);
- assertWithMessage(":16b:", event.newLineCount == 1);
- break;
- }
- case 17 :
- {
- assertWithMessage(":17a:", event.replaceLineCount == 0);
- assertWithMessage(":17b:", event.newLineCount == 2);
- break;
- }
- case 18 :
- {
- assertWithMessage(":18a:", event.replaceLineCount == 0);
- assertWithMessage(":18b:", event.newLineCount == 1);
- break;
- }
- case 19 :
- {
- assertWithMessage(":19a:", event.replaceLineCount == 0);
- assertWithMessage(":19b:", event.newLineCount == 4);
- break;
- }
- case 20 :
- {
- assertWithMessage(":20a:", event.replaceLineCount == 0);
- assertWithMessage(":20b:", event.newLineCount == 2);
- break;
- }
- }
- }
-
- public void textSet(TextChangedEvent event) {
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
deleted file mode 100644
index 2876f483c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/StyledTextTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here.
- * Creation date: (3/20/2001 6:19:58 PM)
- * @author: David Williams
- */
-public class StyledTextTest {
- /**
- * StyledTextTest constructor comment.
- */
- public StyledTextTest() {
- super();
- }
-
- /**
- * Don't forget, the *swt*.dll will have to be copied to program directory for this to work.
- */
- public static void main(String[] args) {
-
- try {
- Shell shell = new Shell();
- GridLayout layout = new GridLayout();
- shell.setLayout(layout);
-
- Button button = new Button(shell, SWT.PUSH);
- button.setText("Action");
- button.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event e) {
- System.out.println("button pushed");
- }
- });
-
- StyledText text = new StyledText(shell, SWT.BORDER + SWT.H_SCROLL + SWT.V_SCROLL);
- GridData data = new GridData(GridData.FILL_BOTH);
- text.setLayoutData(data);
-
- //
- // String fileName = System.getProperty("user.dir") + "\\" + "japanese_utf-16.txt";
- // String encoding = "UnicodeBig";
-
- String fileName = System.getProperty("user.dir") + "\\" + "japanese_cp1252.txt";
- String encoding = "Cp1252";
- //sun.io.ByteToCharConverter.getDefault().toString();
-
- System.out.println("Test file: " + fileName);
- System.out.println(" Encoding: " + encoding);
-
- InputStream in = new FileInputStream(fileName);
- InputStreamReader inStream = new InputStreamReader(in, encoding);
- //Reader inStream = new FileReader(fileName);
- StringBuffer sb = new StringBuffer();
- while (inStream.ready()) {
- sb.append((char) inStream.read());
- }
- String inputString = sb.toString();
- System.out.println("Length of input: " + inputString.length());
- //
- text.setText(inputString);
-
- shell.setSize(400, 200);
- shell.open();
-
- Display display = shell.getDisplay();
- while (shell != null && !shell.isDisposed()) {
- if (!display.readAndDispatch())
- display.sleep();
- }
- }
- catch (Exception t) {
- t.printStackTrace();
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
deleted file mode 100644
index 072f40478..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/other/UnitTests.java
+++ /dev/null
@@ -1,1851 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.other;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.internal.parser.JSPSourceParser;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockMarker;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class UnitTests extends TestCase {
-
- protected IStructuredDocument fModel;
- protected IDOMModel tree;
- protected int eventCase = 1;
- protected boolean eventResult;
-
- public static final int GENERIC_NODES_REPLACED_EVENT_CASE = 1001;
- public static final int GENERIC_REGIONS_REPLACED_EVENT_CASE = 1002;
- public static final int GENERIC_REGION_CHANGED_EVENT_CASE = 1003;
- public static final int GENERIC_NEW_MODEL_EVENT_CASE = 1004;
- public static final int GENERIC_NO_CHANGE_EVENT_CASE = 1005;
-
- protected class StructuredDocumentListenerProxy implements IStructuredDocumentListener {
- public void newModel(NewDocumentEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void noChange(NoChangeEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
-
- public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
- handleEvent(structuredDocumentEvent);
- }
- }
-
- protected StructuredDocumentListenerProxy proxy = new StructuredDocumentListenerProxy();
-
- /**
- * MinimizationTest constructor comment.
- */
- public UnitTests(String name) {
- super(name);
- }
-
- protected void handleEvent(StructuredDocumentEvent structuredDocumentEvent) {
- eventResult = false;
- switch (eventCase) {
- case 1 :
- {
- if (structuredDocumentEvent instanceof NoChangeEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 2 :
- {
- if (structuredDocumentEvent instanceof NoChangeEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 3 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 4 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 5 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- eventResult = true; // ok
- }
- break;
- }
- case 6 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
- if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
- eventResult = true; // ok
- }
- }
- break;
- }
- case 7 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- eventResult = true; // ok
- }
-
- break;
- }
- case 8 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- //if ("<B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(0).getText()))
- //if ("</B>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().item(1).getText())) {
- eventResult = true; // ok
- }
- break;
- }
- case 9 :
- case 10 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
- if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
- eventResult = true; // ok
- }
- break;
- }
- case 11 :
- case 12 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (2 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (0 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- if ("<TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(0).getText()))
- if ("</TD>".equals(((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().item(1).getText()))
- eventResult = true; // ok
- }
- break;
- }
- case 13 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size())
- if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size())
- eventResult = true; // ok
- }
- break;
- }
- case 14 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (3 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getOldStructuredDocumentRegions().getLength())
- if (1 == ((StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent).getNewStructuredDocumentRegions().getLength())
- eventResult = true; // ok
- }
- break;
- }
- case 15 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- RegionChangedEvent regionChangedEvent = (RegionChangedEvent) structuredDocumentEvent;
- IStructuredDocumentRegion documentRegion = ((RegionChangedEvent) structuredDocumentEvent).getStructuredDocumentRegion();
- if ("b ".equals(documentRegion.getFullText(regionChangedEvent.getRegion()))) {
- eventResult = true; // ok
- }
- }
- break;
- }
- case 16 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (0 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
- if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
- eventResult = true; // ok
- }
- }
- }
- break;
- }
- case 17 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (1 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
- if (3 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
- eventResult = true; // ok
- }
- }
- }
- break;
- }
- case 18 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getOldRegions().size()) {
- if (2 == ((RegionsReplacedEvent) structuredDocumentEvent).getNewRegions().size()) {
- eventResult = true; // ok
- }
- }
- }
- break;
- }
- case 19 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 20 :
- case 21 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 22 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 23 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 24 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 25 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 26 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- // JSP5
- case 27 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 28 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 29 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 30 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- // JSP6
- case 31 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 32 :
- {
- // changed 2002, 9/12 to fit -- this is definitely a change
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- RegionsReplacedEvent regionsReplacedEvent = (RegionsReplacedEvent) structuredDocumentEvent;
- if (1 == regionsReplacedEvent.getOldRegions().size()) {
- ITextRegion region = regionsReplacedEvent.getOldRegions().get(0);
- IStructuredDocumentRegion documentRegion = regionsReplacedEvent.getStructuredDocumentRegion();
- String text = documentRegion.getText(region);
- if ("<% aaa %>".equals(text)) {
- eventResult = true; // ok
- }
-
- }
- }
- else if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- StructuredDocumentRegionsReplacedEvent nodesReplacedEvent = (StructuredDocumentRegionsReplacedEvent) structuredDocumentEvent;
- IStructuredDocumentRegionList regions = nodesReplacedEvent.getNewStructuredDocumentRegions();
-
- if (1 == regions.getLength()) {
- IStructuredDocumentRegion region = regions.item(0);
- String text = region.getText();
- //System.out.println(text);
- if ("<c<% aaa ".equals(text)) {
- eventResult = true;
- }
- }
-
- }
- break;
- }
- case 33 :
- {
- // changed 2002, 9/12 to fit
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- // if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 34 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
-
- case 35 :
- {
- // chanced to RegionsReplaced 2002, 9/11 (attribute value to region container)
- // String startString = "<p><img src=\"file.gif\"><p>";
- // String changes = "<";
- // String expectedString = "<p><img src=\"file<.gif\"><p>";
-
- // if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 36 :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 37 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 38 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 39 :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case 40 :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
-
- case GENERIC_NODES_REPLACED_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof StructuredDocumentRegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_REGIONS_REPLACED_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof RegionsReplacedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_REGION_CHANGED_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof RegionChangedEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_NEW_MODEL_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof NewDocumentEvent) {
- eventResult = true; // ok
- }
- break;
- }
- case GENERIC_NO_CHANGE_EVENT_CASE :
- {
- if (structuredDocumentEvent instanceof NoChangeEvent) {
- eventResult = true; // ok
- }
- break;
- }
-
- default :
- {
- if (structuredDocumentEvent instanceof NewDocumentEvent) {
- eventResult = true; // ok
- }
- }
- }
- }
-
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- if (args.length == 0) {
- runAll();
- }
- else if (args.length == 1) {
- String methodToRun = args[0].trim();
- runOne(methodToRun);
- }
- }
-
- protected static void runAll() {
- junit.textui.TestRunner.run(suite());
-
- }
-
- public static void runOne(String methodName) {
- TestSuite testSuite = new TestSuite();
- TestCase test = new UnitTests(methodName);
- testSuite.addTest(test);
- junit.textui.TestRunner.run(testSuite);
-
- }
-
- /**
- * Set up an XML model
- */
- protected void setUpXML() {
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- fModel = mm.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- fModel.addDocumentChangedListener(proxy);
-
- tree = new DOMModelImpl();
-
- if (tree != null) {
- fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
- tree.setStructuredDocument(fModel);
- }
-
- }
-
- /**
- * Set up a JSP model
- */
- protected void setUpJSP() {
-
- IModelManager mm = StructuredModelManager.getModelManager();
- try {
- fModel = mm.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
- }
- catch (IOException e) {
- // do nothing, since dummy
- }
- fModel = StructuredDocumentFactory.getNewStructuredDocumentInstance(new JSPSourceParser());
-
- fModel.addDocumentChangedListener(proxy);
-
- tree = new DOMModelImpl();
-
- if (tree != null) {
- fModel.addDocumentChangingListener((IStructuredDocumentListener) tree);
- tree.setStructuredDocument(fModel);
- }
-
- }
-
- /**
- */
- public void simpleTest() {
-
- setUpJSP();
- eventCase = 99;
- String startString = "";
- String changes = "<a></a>";
- String expectedString = "<a></a>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- //
- fModel.setText(null, startString);
-
- //
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void simpleTest2() {
-
- setUpXML();
- eventCase = 99;
- String startString = "";
- String changes = "<a></a>";
- String expectedString = "<a></a>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void simpleTest3() {
-
- setUpXML();
- eventCase = 99;
- String startString = "<a></a>";
- String changes = "";
- String expectedString = "<a></a>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:16:02 PM)
- * @return junit.framework.Test
- */
- protected static Test suite() {
- return new TestSuite(UnitTests.class);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:28:59 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testDeleteBeginning() {
-
- setUpXML();
- eventCase = 4;
- String expectedString = "<GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 0, 10, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:27:31 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testDeleteEnd() {
-
- setUpXML();
- eventCase = 3;
- String expectedString = "<ABC><DEF>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 10, 5, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- */
- public void testEmbedded() {
-
- setUpJSP();
- eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
- String startString = "<p><img src=\"file.gif\"><p>";
- String changes = "<";
- String expectedString = "<p><img src=\"file<.gif\"><p>";
- int startOfChanges = 17;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- eventCase = 35;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("part 1: text update", result);
- assertTrue("part 1: event type", eventResult);
-
- eventCase = 36;
- startString = expectedString;
- changes = "%";
- expectedString = "<p><img src=\"file<%.gif\"><p>";
- startOfChanges = 18;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 2: text update", result);
- assertTrue("part 2: event type", eventResult);
-
- eventCase = 37;
- startString = expectedString;
- changes = " ";
- expectedString = "<p><img src=\"file<% .gif\"><p>";
- startOfChanges = 19;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 3: text update", result);
- assertTrue("part 3: event type", eventResult);
-
- eventCase = 38;
- startString = expectedString;
- changes = "ab ";
- expectedString = "<p><img src=\"file<% ab .gif\"><p>";
- startOfChanges = 20;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 4: text update", result);
- assertTrue("part 4: event type", eventResult);
-
- eventCase = 39;
- startString = expectedString;
- changes = "%";
- expectedString = "<p><img src=\"file<% ab %.gif\"><p>";
- startOfChanges = 23;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 5: text update", result);
- assertTrue("part 5: event type", eventResult);
-
- eventCase = 40;
- startString = expectedString;
- changes = ">";
- expectedString = "<p><img src=\"file<% ab %>.gif\"><p>";
- startOfChanges = 24;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
-
- assertTrue("part 6: text update", result);
- assertTrue("part 6: event type", eventResult);
-
- }
-
- /**
- */
- public void testEmbeddedJSP2() {
-
- setUpJSP();
- eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<a >c</a>";
- String changes = "<%= b %>";
- String expectedString = "<a <%= b %>>c</a>";
- int startOfChanges = 3;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- public void testDeepEmbeddedJSP() {
-
- setUpJSP();
- eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<script><a >c</a></script>";
- String changes = "<%= b %>";
- String expectedString = "<script><a <%= b %> >c</a></script>";
- int startOfChanges = 11;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- StructuredDocumentEvent event = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
- String testText = testR.getText();
- assertTrue("text retrieve", testText.equals("<a <%= b %> >"));
- testText = testR.getFullText();
- assertTrue("text retrieve", testText.equals("<a <%= b %> >"));
-
- ITextRegionList regionList = testR.getRegions();
-
- ITextRegion region = regionList.get(0);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<"));
-
- region = regionList.get(1);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("a"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("a "));
-
- region = regionList.get(2);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<%= b %>"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("<%= b %> "));
-
- // ===
-
- ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
- ITextRegionList eRegions = cRegion.getRegions();
- ITextRegion eRegion = eRegions.get(0);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
-
- eRegion = eRegions.get(1);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals(" b "));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals(" b "));
-
- eRegion = eRegions.get(2);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals("%>"));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals("%>"));
-
- eRegion = eRegions.get(3);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals(""));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals(" "));
-
- // ====
-
- region = regionList.get(3);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals(">"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals(">"));
-
- }
-
- public void testDeepEmbeddedJSP2() {
-
- setUpJSP();
- eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<script><a >c</a></script>";
- String changes = "<%= b %";
- String expectedString = "<script><a <%= b % >c</a></script>";
- int startOfChanges = 11;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- StructuredDocumentEvent event = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- IStructuredDocumentRegion testR = fModel.getRegionAtCharacterOffset(11);
- String testText = testR.getText();
- assertTrue("text retrieve", testText.equals("<a <%= b % >"));
- testText = testR.getFullText();
- assertTrue("text retrieve", testText.equals("<a <%= b % >"));
-
- ITextRegionList regionList = testR.getRegions();
-
- ITextRegion region = regionList.get(0);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<"));
-
- region = regionList.get(1);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("a"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("a "));
-
- region = regionList.get(2);
- testText = testR.getText(region);
- assertTrue("text retrieve", testText.equals("<%= b % >"));
- testText = testR.getFullText(region);
- assertTrue("text retrieve", testText.equals("<%= b % >"));
-
- // ===
-
- ITextRegionContainer cRegion = (ITextRegionContainer) region;
-
- ITextRegionList eRegions = cRegion.getRegions();
- ITextRegion eRegion = eRegions.get(0);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals("<%="));
-
- eRegion = eRegions.get(1);
- testText = cRegion.getText(eRegion);
- assertTrue("text retrieve", testText.equals(" b % >"));
- testText = cRegion.getFullText(eRegion);
- assertTrue("text retrieve", testText.equals(" b % >"));
-
-
- // ====
- }
-
- public void testDeepEmbeddedJSP3() {
- // CMVC 245586
- // this is a test to make sure ContextRegionContainer returns what we expect
- setUpJSP();
- String startString = "<html><head><script> <%! String testvar = \"testvar\"; %> var test = <%= testvar %> </script></head></html>";
- String expectedText = "<%! String testvar = \"testvar\"; %>";
- ((XMLSourceParser) fModel.getParser()).addBlockMarker(new BlockMarker("script", null, DOMRegionContext.BLOCK_TEXT, false)); //$NON-NLS-1$
- fModel.setText(null, startString);
-
- IStructuredDocumentRegionList nodes = fModel.getRegionList();
-
- IStructuredDocumentRegion scriptBlockRegion = fModel.getRegionAtCharacterOffset(21);
- ITextRegionList blockRegions = scriptBlockRegion.getRegions();
- ITextRegionContainer jspDecl = (ITextRegionContainer) blockRegions.get(1);
- String fullText = jspDecl.getFullText();
-
- //assertTrue("ContextRegionContainer.getFullText()", fullText.equals(expectedText));
- assertEquals("ContextRegionContainer.getFullText() value incorrect: ", expectedText, fullText);
- }
-
- public void testJSP1() {
-
- setUpJSP();
- eventCase = 23;
- String startString = "abcd<%= abc %>efgh";
- String expectedString = "abcd< %= abc %>efgh";
- String changes = " ";
- int startOfChanges = 5;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- public void testJSP2() {
-
- setUpJSP();
- eventCase = 24;
- String startString = "abcd<% abc %>efgh";
- String expectedString = "abcd< % abc %>efgh";
- String changes = " ";
- int startOfChanges = 5;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- public void testJSP3() {
-
- setUpJSP();
- eventCase = 25;
- String startString = "<%= abc %>";
- String expectedString = "< %= abc %>";
- String changes = " ";
- int startOfChanges = 1;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- public void testJSP4() {
-
- setUpJSP();
- eventCase = 26;
- String startString = "<% abc %>";
- String expectedString = "< % abc %>";
- String changes = " ";
- int startOfChanges = 1;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- Give a JSP scriptlet :
- <% aaa %>
- When an user types "<bb>" just before
- the JSP scriptlet :
- (1) When '<' is typed, regionsReplaced()
- is called for "<%".
- (2) When 'b' is typed, nodesReplaced()
- is called for "<<%" and " aaa ".
- (3) When 'b' is typed again, finally,
- nodesReplaced() is called for
- "<b<% aaa" and "%>".
- The end JSP IStructuredDocumentRegion should be
- reparsed at (1), but not wait until (3).
-
- */
- public void testJSP5() {
-
- setUpJSP();
- eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
- String startString = "<% aaa %><p>";
- String changes = "<";
- String expectedString = "<<% aaa %><p>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- eventCase = 27;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
- assertTrue("part 1: text update", result);
- assertTrue("part 1: event type", eventResult);
-
- // step 2
- // ? does assertTrue prevent rest from executing if 'false'?
- // ans: yes
- eventCase = 28;
- startString = expectedString;
- changes = "b";
- expectedString = "<b<% aaa %><p>";
- startOfChanges = 1;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 2: text update", result);
- assertTrue("part 2: event type", eventResult);
-
- eventCase = 29;
- startString = expectedString;
- changes = "b";
- expectedString = "<bb<% aaa %><p>";
- startOfChanges = 2;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 3: text update", result);
- assertTrue("part 3: event type", eventResult);
-
- eventCase = 30;
- startString = expectedString;
- changes = ">";
- expectedString = "<bb><% aaa %><p>";
- startOfChanges = 3;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 4: text update", result);
- assertTrue("part 4: event type", eventResult);
- }
-
- /**
- Example 4)
-
- Given two JSP scriptlets :
- <% aaa %><% bbb %>
- When an user types "<cccc>" just before
- the JSP scriptlet, watch the IStructuredDocument events
- on each character typing.
- You will see the next JSP IStructuredDocumentRegion is reparsed
- (to be broken into other type of IStructuredDocumentRegion)
- one by one on each event.
- But it should be at once at the first event.
- Old Component: wsa.web.pageediting
- New Component: wsa.web.xmleditor
-
-
- */
- public void testJSP6() {
- // caution ... we're re-using event checks from JSP5
-
- setUpJSP();
-
- eventCase = GENERIC_NEW_MODEL_EVENT_CASE;
- String startString = "<% aaa %><% bbb %>";
- String changes = "<";
- String expectedString = "<<% aaa %><% bbb %>";
- int startOfChanges = 0;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
- eventCase = 31;
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
- assertTrue("part 1: text update", result);
- assertTrue("part 1: event type", eventResult);
-
- eventCase = 32;
- startString = expectedString;
- changes = "c";
- expectedString = "<c<% aaa %><% bbb %>";
- startOfChanges = 1;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 2: text update", result);
- assertTrue("part 2: event type", eventResult);
-
- eventCase = 33;
- startString = expectedString;
- changes = "c";
- expectedString = "<cc<% aaa %><% bbb %>";
- startOfChanges = 2;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 3: text update", result);
- assertTrue("part 3: event type", eventResult);
-
- eventCase = 34;
- startString = expectedString;
- changes = ">";
- expectedString = "<cc><% aaa %><% bbb %>";
- startOfChanges = 3;
- lengthToReplace = 0;
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
-
- result = (expectedString.equals(resultString));
- assertTrue("part 4: text update", result);
- assertTrue("part 4: event type", eventResult);
-
- }
-
- /**
- * this test easily returns "ok" even with the no-space bug. Its mostly to
- * "hand examine" the structuredDocument created from the initial setText.
- */
- public void testJSPDirective() {
-
- setUpJSP();
- eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
- String startString = "<%@include%>";
- String changes = "T";
- String expectedString = "<%@include%>T";
- int startOfChanges = 12;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // ?
- // assertTrue(result); // && eventResult);
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:53:08 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod10() {
-
- setUpXML();
- eventCase = 10;
- String expectedString = "<TD></TD>";
-
- fModel.setText(null, "<TD></TD><TD></TD>");
-
- fModel.replaceText(null, 9, 9, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 10:56:04 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod11() {
-
- setUpXML();
- eventCase = 11;
- String expectedString = "<XXX><TD></TD><XXX>";
-
- fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
- fModel.replaceText(null, 5, 9, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 10:59:39 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod12() {
-
- setUpXML();
- eventCase = 12;
- String expectedString = "<XXX><TD></TD><XXX>";
-
- fModel.setText(null, "<XXX><TD></TD><TD></TD><XXX>");
-
- fModel.replaceText(null, 14, 9, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:00:59 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod13() {
-
- setUpXML();
- eventCase = 13;
- String expectedString = "<ABC><JKL><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 5, 5, "<JKL>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:02:19 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod14() {
-
- setUpXML();
- eventCase = 14;
- String expectedString = "<a>\r\r </a>";
-
- fModel.setText(null, "<a>\r<b>\r </a>");
-
- fModel.replaceText(null, 4, 3, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:03:53 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod15() {
-
- setUpXML();
- eventCase = 15;
- String expectedString = "<a><b ></b></a>";
-
- fModel.setText(null, "<a><b></b></a>");
-
- fModel.replaceText(null, 5, 0, " ");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:05:27 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod16() {
-
- setUpXML();
- eventCase = 16;
- String expectedString = "<a><b z></b></a>";
-
- fModel.setText(null, "<a><b ></b></a>");
-
- fModel.replaceText(null, 6, 0, "z");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:06:33 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod17() {
-
- setUpXML();
- eventCase = 17;
- String expectedString = "<a><b z=\"t\"></b></a>";
-
- fModel.setText(null, "<a><b z></b></a>");
-
- fModel.replaceText(null, 6, 1, "z=\"t\"");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:09:17 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod18() {
-
- setUpXML();
- eventCase = 18;
- String expectedString = "<a><c z></b></a>";
-
- fModel.setText(null, "<a><b z></b></a>");
-
- fModel.replaceText(null, 4, 3, "c z");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:10:30 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod19() {
-
- eventCase = 19;
- setUpJSP();
- fModel.setText(null, "<BODY>\r<IMG src=\"<%=\r</BODY>\r");
- String expectedString = "<BODY>\r<IMG src=\"<%=Q\r</BODY>\r";
-
- fModel.replaceText(null, 20, 0, "Q");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:12:05 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod20() {
-
- setUpJSP();
-
- eventCase = 20;
- String expectedString = "<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
- fModel.setText(null, "<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
- fModel.replaceText(null, 28, 1, "\rBODY {\r\r}");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/2/2001 11:32:23 AM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod21() {
-
- setUpJSP();
-
- eventCase = 21;
- String expectedString = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\rBODY {\r\r}-->\r</STYLE>\r";
-
- fModel.setText(null, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"\">\r<HTML>\r<HEAD>\r <META content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\">\r<META name=\"GENERATOR\" content=\"IBM WebSphere Page Designer V4.1.0 for Windows\">\r<META content=\"text/css\" http-equiv=\"Content-Style-Type\">\r<TITLE></TITLE>\r<STYLE TYPE=\"text/css\">\r<!--\r-->\r</STYLE>\r");
-
- fModel.replaceText(null, 343, 1, "\rBODY {\r\r}");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:45:29 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethod9() {
-
- setUpXML();
- eventCase = 9;
- String expectedString = "<TD></TD>";
-
- fModel.setText(null, "<TD></TD><TD></TD>");
-
- fModel.replaceText(null, 0, 9, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:45:29 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testMethodAttributeNameReplace1() {
-
- //testEvent = 22;
- //tags = "<tagName abc=\"bsf\">";
- //testStructuredDocumentReplacement(testEvent, tags, "abcde","<tagName abcde=\"bsf\">", 9, 3);
-
- setUpXML();
- eventCase = 22;
- String startString = "<tagName abc=\"bsf\">";
- String expectedString = "<tagName abcde=\"bsf\">";
- String changes = "abcde";
- int startOfChanges = 9;
- int lengthToReplace = 3;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:35:41 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testModifyMiddle() {
-
- setUpXML();
- eventCase = 5;
- String expectedString = "<ABC><JKL><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 0, 15, "<ABC><JKL><GHI>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:06:33 PM)
- */
- public void testNoChange1() {
-
- setUpXML();
- eventCase = 1;
- String expectedString = "<ABC><DEF><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 10, 0, "");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:26:05 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testNoChange2() {
-
- setUpXML();
- eventCase = 2;
- String expectedString = "<ABC><DEF><GHI>";
-
- fModel.setText(null, "<ABC><DEF><GHI>");
-
- fModel.replaceText(null, 0, 15, "<ABC><DEF><GHI>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:38:25 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testSimilarStart() {
-
- setUpXML();
- eventCase = 6;
- String expectedString = "<P><B></B><B></B></P>";
-
- fModel.setText(null, "<P><B></B></P>");
-
- fModel.replaceText(null, 3, 0, "<B></B>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:43:29 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testSimilarStartEnd() {
-
- setUpXML();
- eventCase = 8;
- String expectedString = "<P><B><B></B></B></P>";
-
- fModel.setText(null, "<P><B></B></P>");
-
- fModel.replaceText(null, 6, 0, "<B></B>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (8/1/2001 6:41:46 PM)
- * @exception SourceEditingException The exception description.
- */
- public void testSimiliarEnd() {
-
- setUpXML();
- eventCase = 7;
- String expectedString = "<P><B></B><P><P>";
-
- fModel.setText(null, "<P><B></B><P>");
-
- fModel.replaceText(null, 10, 0, "<P>");
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
- }
-
- /**
- */
- public void testTagReDetection() {
-
- setUpJSP();
- // (nsd) 2003.12.10 - changed from NodesReplaced to RegionsReplaced since the start condition was changed
- // from being 3 document regions to 4 since "script" is not 'nestable'
- //eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
-
- // reverted 2004.04.05
- eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
-// eventCase = GENERIC_REGIONS_REPLACED_EVENT_CASE;
- String startString = "<p>test<<SCRIPT>";
- String changes = "S";
- String expectedString = "<p>test<S<SCRIPT>";
- int startOfChanges = 8;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // ? assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void testTagReDetection2() {
-
- setUpJSP();
- eventCase = GENERIC_REGION_CHANGED_EVENT_CASE;
- String startString = "<p>test<<SCRIPT>";
- String changes = "S";
- String expectedString = "<p>test<<SCRIPTS>";
- int startOfChanges = 15;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- */
- public void testTagReDetection3() {
-
- setUpJSP();
- eventCase = GENERIC_NODES_REPLACED_EVENT_CASE;
- String startString = "<p>test<test>";
- String changes = "%";
- String expectedString = "<p>test<%test>";
- int startOfChanges = 8;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- assertTrue("event type", eventResult);
-
- }
-
- /**
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- if (fModel != null)
- fModel.removeDocumentChangedListener(proxy);
- }
-
- /**
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- public void testPageDirective() {
- boolean verbose = false;
- setUpJSP();
- eventCase = 999; //GENERIC_NODES_REPLACED_EVENT_CASE;
- String startString = "<%@page lang=\"java\" <SCRIPT>var <% test %> String</SCRIPT>";
- String changes = "s";
- String expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
- int startOfChanges = 18;
- int lengthToReplace = 0;
-
- fModel.setText(null, startString);
-
- if (verbose) {
- Debug.dump(fModel, true);
- }
-
- StructuredDocumentEvent structuredDocumentEvent = fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- String resultString = fModel.getText();
-
- boolean result = (expectedString.equals(resultString));
-
- // assertTrue(result); // && eventResult);
- assertTrue("text update", result);
- //assertTrue("event type", eventResult);
-
- if (verbose) {
- System.out.println();
- System.out.println("structured document:");
- IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
- Debug.dump(document, true);
- }
-
- // now delete quote
- changes = "";
- expectedString = "<%@page lang=\"javas\" <SCRIPT>var <% test %> String</SCRIPT>";
- startOfChanges = 19;
- lengthToReplace = 1;
- fModel.replaceText(null, startOfChanges, lengthToReplace, changes);
- resultString = fModel.getText();
- assertTrue("text update", result);
-
- if (verbose) {
- System.out.println();
- System.out.println("structured document:");
- IStructuredDocument document = structuredDocumentEvent.getStructuredDocument();
- Debug.dump(document, true);
- }
-
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
deleted file mode 100644
index daa65877c..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/pagedirective/TestPageDirective.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.pagedirective;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.document.PageDirectiveAdapter;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.EmbeddedTypeHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.modelhandler.EmbeddedXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Node;
-
-/**
- * @author davidw
- */
-public class TestPageDirective extends TestCase {
-
- class MyEmbeddedFactory implements INodeAdapterFactory {
-
- public INodeAdapter adapt(INodeNotifier object) {
- return null;
- }
-
- public INodeAdapterFactory copy() {
- return null;
- }
-
- public boolean isFactoryForType(Object type) {
- return type instanceof MyAdaptedClass;
- }
-
- public void release() {
- // noop
- }
- }
-
- class MyAdaptedClass {
- // dummy class is key
- }
-
- /**
- * Constructor for TestPageDirective.
- * @param name
- */
- public TestPageDirective(String name) {
- super(name);
- }
-
- public void testBasicPD() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
- String contentType = pageDirectiveAdapter.getContentType();
- String language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be java", "java".equals(language));
-
- }
-
- public void testBasicChangedPD() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
- String contentType = pageDirectiveAdapter.getContentType();
- String language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be java", "java".equals(language));
-
- // change to javascript
- model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
- contentType = pageDirectiveAdapter.getContentType();
- language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be javascript", "javascript".equals(language));
-
- }
-
- public void testBasicChangedPDBack() throws IOException {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
-
- String contentType = pageDirectiveAdapter.getContentType();
- String language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be java", "java".equals(language));
-
- // change to javascript
- model.getStructuredDocument().replaceText(this, 43, 4, "javascript");
-
- contentType = pageDirectiveAdapter.getContentType();
- language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertTrue("language should be javascript", "javascript".equals(language));
-
- // change back to java
- model.getStructuredDocument().replaceText(this, 43, 10, "java");
-
- contentType = pageDirectiveAdapter.getContentType();
- language = pageDirectiveAdapter.getLanguage();
-
- assertTrue("contentType should be html", "text/html".equals(contentType));
- assertEquals("java", language);
- }
-
- public void testSetEmbeddedType(){
- IStructuredModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) ((IDOMModel) model).getDocument().getAdapterFor(PageDirectiveAdapter.class);
- EmbeddedTypeHandler embeddedXMLHandler = new EmbeddedXML();
- pageDirectiveAdapter.setEmbeddedType(embeddedXMLHandler);
-
- EmbeddedTypeHandler handler = pageDirectiveAdapter.getEmbeddedType();
- assertTrue("incorrect embedded handler", handler == embeddedXMLHandler);
- }
-
- public void testAdapt() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- Node ownerNode = model.getDocument();
-
- ModelQueryAdapter embeddedAdapter = (ModelQueryAdapter) pageDirectiveAdapter.adapt((INodeNotifier) ownerNode, ModelQueryAdapter.class);
- assertNotNull("could not adapt embedded adapter", embeddedAdapter);
- }
-
- public void testAddEmbeddedFactory() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- pageDirectiveAdapter.addEmbeddedFactory(new MyEmbeddedFactory());
- }
-
- public void testSetLanguage() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- pageDirectiveAdapter.setLanguage("text/xml");
- assertTrue("set language failed", pageDirectiveAdapter.getLanguage().equals("text/xml"));
- }
-
- public void testGetTarget() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- INodeNotifier notifier = pageDirectiveAdapter.getTarget();
- assertNotNull("target is null", notifier);
- }
-
- public void testRelease() {
- IDOMModel model = createUnmanagedHTMLModel();
- PageDirectiveAdapter pageDirectiveAdapter = (PageDirectiveAdapter) model.getDocument().getAdapterFor(PageDirectiveAdapter.class);
- pageDirectiveAdapter.release();
- // considered "success" if doesn't through exception
- assertTrue(true);
- }
-
- private IDOMModel createUnmanagedHTMLModel() {
- // First make (empty) structuredDocument
- IModelManager modelManager = StructuredModelManager.getModelManager();
- IStructuredModel model = modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
- assertTrue("model could not be created!", model != null);
-
- // Now, assigning use a page directive, but leaving embedded type the same as default
- model.getStructuredDocument().setText(this, "<%@ page contentType=\"text/html\" language=\"java\" %>");
- return (IDOMModel)model;
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
deleted file mode 100644
index 4f8f3b24f..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/TestStructuredPartitionerJSP.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.ui.tests.partitioning;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.text.DecimalFormat;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jst.jsp.core.internal.provisional.text.IJSPPartitionTypes;
-import org.eclipse.wst.css.core.internal.provisional.text.ICSSPartitionTypes;
-import org.eclipse.wst.html.core.internal.provisional.text.IHTMLPartitionTypes;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.text.IXMLPartitions;
-
-public class TestStructuredPartitionerJSP extends TestCase {
-
- private boolean DEBUG_PRINT_RESULT = false;
- protected ITypedRegion[] partitions = null;
-
- private boolean useFormatter = true;
- protected DecimalFormat formatter;
-
- public TestStructuredPartitionerJSP(String name) {
- super(name);
- if (DEBUG_PRINT_RESULT && useFormatter)
- formatter = new DecimalFormat();
- }
-
- public void testJSP1() throws IOException, BadLocationException { // DW 05/01/2003 I modified this test, after creating test6,
- // and changing partioner to pick up end *> as part of page directive
- // partition (for highlighting to work right).
- int expectedPartitions = 8;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example01.jsp");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IJSPPartitionTypes.JSP_DIRECTIVE, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_DIRECTIVE, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT});
- }
-
- public void testJSP2() throws IOException, BadLocationException {
- int expectedPartitions = 11;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example02.jsp");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.HTML_COMMENT, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT,});
- }
-
- public void testJSP3() throws IOException, BadLocationException {
- int expectedPartitions = 5;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example03.jsp");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.SCRIPT, IHTMLPartitionTypes.HTML_DEFAULT, ICSSPartitionTypes.STYLE, IHTMLPartitionTypes.HTML_DEFAULT,});
- }
-
- public void testJSP4() throws IOException, BadLocationException {
- int expectedPartitions = 8;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example04.jsp");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, "org.eclipse.wst.html.SCRIPT.language.MYLANGUAGE", IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_COMMENT, IHTMLPartitionTypes.HTML_DEFAULT});
- }
-
- public void testJSP5() throws IOException, BadLocationException {
- int expectedPartitions = 17;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example05.jsp");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IHTMLPartitionTypes.HTML_DEFAULT, IHTMLPartitionTypes.SCRIPT, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_COMMENT, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IJSPPartitionTypes.JSP_CONTENT_JAVA, IJSPPartitionTypes.JSP_CONTENT_DELIMITER, IHTMLPartitionTypes.HTML_DEFAULT});
- }
-
- public void testJSP6() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/jsp/example06.jsp");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IJSPPartitionTypes.JSP_DIRECTIVE,});
- }
-
- public void testPerfJSP() throws IOException, BadLocationException {
- //int expectedPartitions = 6;
- int nPartitions = doTimedComputePartitioningTest("testfiles/jsp/company300k.jsp");
- //assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- //checkSeams();
- //verifyPartitionTypes(partitions, new String[]{IXMLPartitions.ST_XML_PI, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_DECLARATION, IXMLPartitions.ST_DEFAULT_XML, IXMLPartitions.ST_XML_COMMENT, IXMLPartitions.ST_DEFAULT_XML});
- }
-
- public void testEmpty() throws IOException, BadLocationException {
- int expectedPartitions = 1;
- int nPartitions = doComputePartitioningTest("testfiles/xml/empty.xml");
- assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
- checkSeams();
- verifyPartitionTypes(partitions, new String[]{IXMLPartitions.XML_DEFAULT});
- }
-
- /**
- * Ensure that the current list of partitions are all adjacent to one another
- */
- protected void checkSeams() {
- if (partitions == null)
- return;
- int offset = 0;
- for (int i = 0; i < partitions.length; i++) {
- assertEquals("partitions are not contiguous!", partitions[i].getOffset(), offset);
- offset = partitions[i].getOffset() + partitions[i].getLength();
- }
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new StringBufferInputStream("");
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
-
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Compute the partitions for the given filename using the default partitioner
- * for that file type.
- *
- * @param filename
- * @return int
- * @throws IOException
- * @throws BadLocationException
- */
- protected int doTimedComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- if (inStream == null)
- inStream = new StringBufferInputStream("");
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
- if (DEBUG_PRINT_RESULT && useFormatter) {
- double baseTen = Math.log(10);
- formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
- formatter.setGroupingUsed(false);
- }
- long startTime = System.currentTimeMillis();
- partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
- long endTime = System.currentTimeMillis();
- if (DEBUG_PRINT_RESULT) {
-
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- System.out.println("Time to compute " + partitions.length + ": " + (endTime-startTime) + " (msecs)");
- for (int i = 0; i < partitions.length; i++) {
- try {
- contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- if (useFormatter)
- System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
- else
- System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
- }
- }
- checkSeams();
- model.releaseFromEdit();
- inStream.close();
-
- if (partitions == null)
- return -1;
- return partitions.length;
- }
-
- /**
- * Retrieves the single partition at the given offset for the given file, using the
- * default partitioner for that file type. This test allows for verifying the zero-length
- * partitioning behavior.
- *
- * @param filename
- * @param offset
- * @return ITypedRegion
- * @throws IOException
- * @throws BadLocationException
- */
- protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = getClass().getResourceAsStream(filename);
- IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
- IStructuredDocument structuredDocument = model.getStructuredDocument();
-
- partitions = null;
- ITypedRegion partition = structuredDocument.getPartition(offset);
- if (DEBUG_PRINT_RESULT) {
- String contents = null;
-
- System.out.println("\nfilename: " + filename);
- try {
- contents = structuredDocument.get(partition.getOffset(), partition.getLength());
- }
- catch (BadLocationException e) {
- contents = "*error*";
- }
- System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
- }
- model.releaseFromEdit();
- inStream.close();
-
- return partition;
- }
-
- /**
- * Verifies that the given partitions are of the given partition types
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
- for (int i = 0; i < expectedTypes.length; i++)
- assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
- }
-
- /**
- * Verifies that the given partitions begin at the given offsets
- * @param typedRegions
- * @param types
- */
- protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
- for (int i = 0; i < offsets.length; i++) {
- assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
- if (i > 0) {
- assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
- }
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp b/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
deleted file mode 100644
index cadf5e7fe..000000000
--- a/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/partitioning/testfiles/jsp/company300k.jsp
+++ /dev/null
@@ -1,8099 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>The Ultimate A Company</title>
- </head>
- <body>
- <p>
- <img src="../banner.gif" height="51" width="659" alt="" />
- </p>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- <td>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Products
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- What's New
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Order Online
- </h3>
- <h3>
- <img src="../bullet.gif" height="30" width="38" alt="" />
- Support
- </h3>
- </td>
- </tr>
- <tr>
- <td colspan="3">
- For problems and suggestions related to this web site, write to Webmaster:
- <a href="mailto:webmaster@theultimateacompany.com">webmaster@theultimateacompany.com</a>
- </td>
- </tr>
- </tbody>
- </table>
- <table width="84%">
- <tbody>
- <tr>
- <td rowspan="2">
- <h2>
- <img src="../leftpanel.jpg" height="498" width="124" alt="" />
- </h2>
- </td>
- <td colspan="2">
- <h4>Some people think that A is just another letter. We are not some people. We at the Ultimate A Company think that A is special. When approached by a team united by the common passion, skills and devotion to the world of letters, a humble A can become a true work of art.&nbsp;</h4>
- <h4>
- Take a look at our product catalog and we are sure you will agree. We design, manufacture and ship As of any shape, size and color, finished in any way imaginable. And we will be happy to cater to your every desire and make a custom, one-of-a-kind A that will last for a lifetime. Our passion and our attention to detail all work towards one final goal - to deliver state of the '
- <b>A</b>
- 'rt.&nbsp;
- </h4>
- <h3>Don't settle for ordinary. You deserve only the best.</h3>
- </td>
- </tr>
- <tr>
- <td>&