Skip to content

Commit cee2920

Browse files
rbucktonrbuckton
committed
Fix preProcessFile tests
1 parent b4e113b commit cee2920

File tree

1 file changed

+51
-0
lines changed

1 file changed

+51
-0
lines changed

‎src/harness/unittests/services/preProcessFile.ts

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ describe("PreProcessFile:", () => {
99
checkFileReferenceList("Imported files", expectedPreProcess.importedFiles, resultPreProcess.importedFiles);
1010
checkFileReferenceList("Referenced files", expectedPreProcess.referencedFiles, resultPreProcess.referencedFiles);
1111
checkFileReferenceList("Type reference directives", expectedPreProcess.typeReferenceDirectives, resultPreProcess.typeReferenceDirectives);
12+
checkFileReferenceList("Lib reference directives", expectedPreProcess.libReferenceDirectives, resultPreProcess.libReferenceDirectives);
1213

1314
assert.deepEqual(resultPreProcess.ambientExternalModules, expectedPreProcess.ambientExternalModules);
1415
}
@@ -41,6 +42,7 @@ describe("PreProcessFile:", () => {
4142
{ fileName: "refFile3.ts", pos: 94, end: 105 }, { fileName: "..\\refFile4d.ts", pos: 131, end: 146 }],
4243
importedFiles: <ts.FileReference[]>[],
4344
typeReferenceDirectives: [],
45+
libReferenceDirectives: [],
4446
ambientExternalModules: undefined,
4547
isLibFile: false
4648
});
@@ -54,6 +56,7 @@ describe("PreProcessFile:", () => {
5456
referencedFiles: <ts.FileReference[]>[],
5557
importedFiles: <ts.FileReference[]>[],
5658
typeReferenceDirectives: [],
59+
libReferenceDirectives: [],
5760
ambientExternalModules: undefined,
5861
isLibFile: false
5962
});
@@ -67,6 +70,7 @@ describe("PreProcessFile:", () => {
6770
referencedFiles: <ts.FileReference[]>[],
6871
importedFiles: <ts.FileReference[]>[],
6972
typeReferenceDirectives: [],
73+
libReferenceDirectives: [],
7074
ambientExternalModules: undefined,
7175
isLibFile: false
7276
});
@@ -80,6 +84,7 @@ describe("PreProcessFile:", () => {
8084
referencedFiles: <ts.FileReference[]>[],
8185
importedFiles: <ts.FileReference[]>[],
8286
typeReferenceDirectives: [],
87+
libReferenceDirectives: [],
8388
ambientExternalModules: undefined,
8489
isLibFile: false
8590
});
@@ -92,6 +97,7 @@ describe("PreProcessFile:", () => {
9297
{
9398
referencedFiles: <ts.FileReference[]>[],
9499
typeReferenceDirectives: [],
100+
libReferenceDirectives: [],
95101
importedFiles: [{ fileName: "r1.ts", pos: 20, end: 25 }, { fileName: "r2.ts", pos: 49, end: 54 }, { fileName: "r3.ts", pos: 78, end: 83 },
96102
{ fileName: "r4.ts", pos: 106, end: 111 }, { fileName: "r5.ts", pos: 138, end: 143 }],
97103
ambientExternalModules: undefined,
@@ -106,6 +112,7 @@ describe("PreProcessFile:", () => {
106112
{
107113
referencedFiles: <ts.FileReference[]>[],
108114
typeReferenceDirectives: [],
115+
libReferenceDirectives: [],
109116
importedFiles: <ts.FileReference[]>[],
110117
ambientExternalModules: undefined,
111118
isLibFile: false
@@ -119,6 +126,7 @@ describe("PreProcessFile:", () => {
119126
{
120127
referencedFiles: <ts.FileReference[]>[],
121128
typeReferenceDirectives: [],
129+
libReferenceDirectives: [],
122130
importedFiles: [{ fileName: "r3.ts", pos: 73, end: 78 }],
123131
ambientExternalModules: undefined,
124132
isLibFile: false
@@ -132,6 +140,7 @@ describe("PreProcessFile:", () => {
132140
{
133141
referencedFiles: [{ fileName: "refFile1.ts", pos: 20, end: 31 }, { fileName: "refFile2.ts", pos: 57, end: 68 }],
134142
typeReferenceDirectives: [],
143+
libReferenceDirectives: [],
135144
importedFiles: [{ fileName: "r1.ts", pos: 92, end: 97 }, { fileName: "r2.ts", pos: 121, end: 126 }],
136145
ambientExternalModules: undefined,
137146
isLibFile: false
@@ -145,6 +154,7 @@ describe("PreProcessFile:", () => {
145154
{
146155
referencedFiles: [{ fileName: "refFile1.ts", pos: 20, end: 31 }],
147156
typeReferenceDirectives: [],
157+
libReferenceDirectives: [],
148158
importedFiles: [{ fileName: "r1.ts", pos: 91, end: 96 }, { fileName: "r3.ts", pos: 148, end: 153 }],
149159
ambientExternalModules: undefined,
150160
isLibFile: false
@@ -164,6 +174,7 @@ describe("PreProcessFile:", () => {
164174
{
165175
referencedFiles: [],
166176
typeReferenceDirectives: [],
177+
libReferenceDirectives: [],
167178
importedFiles: [
168179
{ fileName: "m1", pos: 20, end: 22 },
169180
{ fileName: "m2", pos: 51, end: 53 },
@@ -188,6 +199,7 @@ describe("PreProcessFile:", () => {
188199
{
189200
referencedFiles: [],
190201
typeReferenceDirectives: [],
202+
libReferenceDirectives: [],
191203
importedFiles: [
192204
{ fileName: "m1", pos: 14, end: 16 },
193205
{ fileName: "m2", pos: 36, end: 38 },
@@ -212,6 +224,7 @@ describe("PreProcessFile:", () => {
212224
{
213225
referencedFiles: [],
214226
typeReferenceDirectives: [],
227+
libReferenceDirectives: [],
215228
importedFiles: [],
216229
ambientExternalModules: ["B"],
217230
isLibFile: false
@@ -225,6 +238,7 @@ describe("PreProcessFile:", () => {
225238
{
226239
referencedFiles: [],
227240
typeReferenceDirectives: [],
241+
libReferenceDirectives: [],
228242
importedFiles: [
229243
{ fileName: "m1", pos: 26, end: 28 }
230244
],
@@ -244,6 +258,7 @@ describe("PreProcessFile:", () => {
244258
{
245259
referencedFiles: [],
246260
typeReferenceDirectives: [],
261+
libReferenceDirectives: [],
247262
importedFiles: [
248263
{ fileName: "m1", pos: 39, end: 41 },
249264
{ fileName: "m2", pos: 74, end: 76 },
@@ -264,6 +279,7 @@ describe("PreProcessFile:", () => {
264279
{
265280
referencedFiles: [],
266281
typeReferenceDirectives: [],
282+
libReferenceDirectives: [],
267283
importedFiles: [
268284
{ fileName: "mod1", pos: 21, end: 25 },
269285
{ fileName: "mod2", pos: 29, end: 33 },
@@ -282,6 +298,7 @@ describe("PreProcessFile:", () => {
282298
{
283299
referencedFiles: [],
284300
typeReferenceDirectives: [],
301+
libReferenceDirectives: [],
285302
importedFiles: [
286303
{ fileName: "mod1", pos: 28, end: 32 },
287304
{ fileName: "mod2", pos: 36, end: 40 },
@@ -303,6 +320,7 @@ describe("PreProcessFile:", () => {
303320
{
304321
referencedFiles: [],
305322
typeReferenceDirectives: [],
323+
libReferenceDirectives: [],
306324
importedFiles: [
307325
{ fileName: "../Observable", pos: 28, end: 41 }
308326
],
@@ -323,6 +341,7 @@ describe("PreProcessFile:", () => {
323341
{
324342
referencedFiles: [],
325343
typeReferenceDirectives: [],
344+
libReferenceDirectives: [],
326345
importedFiles: [
327346
{ fileName: "m", pos: 123, end: 124 },
328347
{ fileName: "../Observable", pos: 28, end: 41 }
@@ -344,6 +363,7 @@ describe("PreProcessFile:", () => {
344363
{
345364
referencedFiles: [],
346365
typeReferenceDirectives: [],
366+
libReferenceDirectives: [],
347367
importedFiles: [
348368
{ fileName: "m", pos: 123, end: 124 },
349369
{ fileName: "../Observable", pos: 28, end: 41 }
@@ -365,6 +385,7 @@ describe("PreProcessFile:", () => {
365385
{
366386
referencedFiles: [],
367387
typeReferenceDirectives: [],
388+
libReferenceDirectives: [],
368389
importedFiles: [
369390
{ fileName: "../Observable", pos: 28, end: 41 }
370391
],
@@ -385,6 +406,7 @@ describe("PreProcessFile:", () => {
385406
{
386407
referencedFiles: [],
387408
typeReferenceDirectives: [],
409+
libReferenceDirectives: [],
388410
importedFiles: [
389411
{ fileName: "../Observable", pos: 28, end: 41 }
390412
],
@@ -404,6 +426,7 @@ describe("PreProcessFile:", () => {
404426
{
405427
referencedFiles: [],
406428
typeReferenceDirectives: [],
429+
libReferenceDirectives: [],
407430
importedFiles: [
408431
{ fileName: "../Observable", pos: 28, end: 41 }
409432
],
@@ -425,6 +448,7 @@ describe("PreProcessFile:", () => {
425448
{
426449
referencedFiles: [],
427450
typeReferenceDirectives: [],
451+
libReferenceDirectives: [],
428452
importedFiles: [
429453
{ fileName: "m2", pos: 65, end: 67 },
430454
{ fileName: "augmentation", pos: 102, end: 114 }
@@ -449,6 +473,7 @@ describe("PreProcessFile:", () => {
449473
{
450474
referencedFiles: [],
451475
typeReferenceDirectives: [],
476+
libReferenceDirectives: [],
452477
importedFiles: [
453478
{ fileName: "m2", pos: 127, end: 129 },
454479
{ fileName: "augmentation", pos: 164, end: 176 }
@@ -475,6 +500,32 @@ describe("PreProcessFile:", () => {
475500
{ pos: 73, end: 75, fileName: "a1" },
476501
{ pos: 152, end: 154, fileName: "a3" }
477502
],
503+
libReferenceDirectives: [],
504+
importedFiles: [],
505+
ambientExternalModules: undefined,
506+
isLibFile: false
507+
});
508+
});
509+
it ("correctly recognizes lib reference directives", () => {
510+
test(`
511+
/// <reference path="a"/>
512+
/// <reference lib="a1"/>
513+
/// <reference path="a2"/>
514+
/// <reference lib="a3"/>
515+
`,
516+
/*readImportFile*/ true,
517+
/*detectJavaScriptImports*/ false,
518+
{
519+
referencedFiles: [
520+
{ pos: 34, end: 35, fileName: "a" },
521+
{ pos: 110, end: 112, fileName: "a2" }
522+
],
523+
typeReferenceDirectives: [
524+
],
525+
libReferenceDirectives: [
526+
{ pos: 71, end: 73, fileName: "a1" },
527+
{ pos: 148, end: 150, fileName: "a3" }
528+
],
478529
importedFiles: [],
479530
ambientExternalModules: undefined,
480531
isLibFile: false

0 commit comments

Comments
 (0)