Skip to content

Commit 8c2091b

Browse files
sheetalkamatsheetalkamat
committed
Add tests to cover scenarios for relative path reference resolution
1 parent a54f974 commit 8c2091b

37 files changed

+349
-1
lines changed

‎src/harness/projectsRunner.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ interface ProjectRunnerTestCase {
1717
baselineCheck?: boolean; // Verify the baselines of output files, if this is false, we will write to output to the disk but there is no verification of baselines
1818
runTest?: boolean; // Run the resulting test
1919
bug?: string; // If there is any bug associated with this test case
20+
noResolve?: boolean;
2021
}
2122

2223
interface ProjectRunnerTestCaseResolutionInfo extends ProjectRunnerTestCase {
@@ -162,7 +163,8 @@ class ProjectRunner extends RunnerBase {
162163
outDir: testCase.outDir,
163164
mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? sys.resolvePath(testCase.mapRoot) : testCase.mapRoot,
164165
sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? sys.resolvePath(testCase.sourceRoot) : testCase.sourceRoot,
165-
module: moduleKind
166+
module: moduleKind,
167+
noResolve: testCase.noResolve
166168
};
167169
}
168170

‎tests/baselines/reference/project/referenceResolutionRelativePaths/amd/FieldManager.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path="../../../typings/tsd.ts" />
2+
var FieldManager = (function () {
3+
function FieldManager() {
4+
}
5+
return FieldManager;
6+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePaths/amd/diskFile0.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
2+
// This is tsd.ts
3+
var tsd = (function () {
4+
function tsd() {
5+
}
6+
return tsd;
7+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
../../../src/ts/Manager/FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'.
2+
FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'.
3+
4+
5+
==== ../../../src/ts/Manager/FieldManager.ts (1 errors) ====
6+
/// <reference path="../../../typings/tsd.ts" />
7+
8+
class FieldManager {
9+
~~~~~~~~~~~~
10+
!!! error TS2300: Duplicate identifier 'FieldManager'.
11+
}
12+
==== ../../../typings/tsd.ts (0 errors) ====
13+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
14+
// This is tsd.ts
15+
class tsd {
16+
}
17+
==== FieldManager.ts (1 errors) ====
18+
/// <reference path="../../../typings/tsd.ts" />
19+
20+
class FieldManager {
21+
~~~~~~~~~~~~
22+
!!! error TS2300: Duplicate identifier 'FieldManager'.
23+
}

‎tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true,
9+
"resolvedInputFiles": [
10+
"lib.d.ts",
11+
"../../../src/ts/Manager/FieldManager.ts",
12+
"../../../typings/tsd.ts",
13+
"FieldManager.ts"
14+
],
15+
"emittedFiles": [
16+
"../../../src/ts/Manager/FieldManager.js",
17+
"../../../typings/tsd.js",
18+
"FieldManager.js"
19+
]
20+
}

‎tests/baselines/reference/project/referenceResolutionRelativePaths/node/FieldManager.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path="../../../typings/tsd.ts" />
2+
var FieldManager = (function () {
3+
function FieldManager() {
4+
}
5+
return FieldManager;
6+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePaths/node/diskFile0.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
2+
// This is tsd.ts
3+
var tsd = (function () {
4+
function tsd() {
5+
}
6+
return tsd;
7+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
../../../src/ts/Manager/FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'.
2+
FieldManager.ts(3,7): error TS2300: Duplicate identifier 'FieldManager'.
3+
4+
5+
==== ../../../src/ts/Manager/FieldManager.ts (1 errors) ====
6+
/// <reference path="../../../typings/tsd.ts" />
7+
8+
class FieldManager {
9+
~~~~~~~~~~~~
10+
!!! error TS2300: Duplicate identifier 'FieldManager'.
11+
}
12+
==== ../../../typings/tsd.ts (0 errors) ====
13+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
14+
// This is tsd.ts
15+
class tsd {
16+
}
17+
==== FieldManager.ts (1 errors) ====
18+
/// <reference path="../../../typings/tsd.ts" />
19+
20+
class FieldManager {
21+
~~~~~~~~~~~~
22+
!!! error TS2300: Duplicate identifier 'FieldManager'.
23+
}

‎tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true,
9+
"resolvedInputFiles": [
10+
"lib.d.ts",
11+
"../../../src/ts/Manager/FieldManager.ts",
12+
"../../../typings/tsd.ts",
13+
"FieldManager.ts"
14+
],
15+
"emittedFiles": [
16+
"../../../src/ts/Manager/FieldManager.js",
17+
"../../../typings/tsd.js",
18+
"FieldManager.js"
19+
]
20+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution",
4+
"inputFiles": [
5+
"src/ts/Manager/FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true,
9+
"resolvedInputFiles": [
10+
"lib.d.ts",
11+
"typings/tsd.ts",
12+
"src/ts/Manager/FieldManager.ts"
13+
],
14+
"emittedFiles": [
15+
"typings/tsd.js",
16+
"typings/tsd.d.ts",
17+
"src/ts/Manager/FieldManager.js",
18+
"src/ts/Manager/FieldManager.d.ts"
19+
]
20+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../../../typings/tsd.d.ts" />
2+
declare class FieldManager {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/src/ts/Manager/FieldManager.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path="../../../typings/tsd.ts" />
2+
var FieldManager = (function () {
3+
function FieldManager() {
4+
}
5+
return FieldManager;
6+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.d.ts" />
2+
declare class tsd {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/typings/tsd.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
2+
// This is tsd.ts
3+
var tsd = (function () {
4+
function tsd() {
5+
}
6+
return tsd;
7+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution",
4+
"inputFiles": [
5+
"src/ts/Manager/FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true,
9+
"resolvedInputFiles": [
10+
"lib.d.ts",
11+
"typings/tsd.ts",
12+
"src/ts/Manager/FieldManager.ts"
13+
],
14+
"emittedFiles": [
15+
"typings/tsd.js",
16+
"typings/tsd.d.ts",
17+
"src/ts/Manager/FieldManager.js",
18+
"src/ts/Manager/FieldManager.d.ts"
19+
]
20+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../../../typings/tsd.d.ts" />
2+
declare class FieldManager {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/src/ts/Manager/FieldManager.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path="../../../typings/tsd.ts" />
2+
var FieldManager = (function () {
3+
function FieldManager() {
4+
}
5+
return FieldManager;
6+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.d.ts" />
2+
declare class tsd {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/typings/tsd.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
2+
// This is tsd.ts
3+
var tsd = (function () {
4+
function tsd() {
5+
}
6+
return tsd;
7+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"FieldManager.ts",
6+
"../../../typings/tsd.ts"
7+
],
8+
"resolvedInputFiles": [
9+
"lib.d.ts",
10+
"FieldManager.ts",
11+
"../../../typings/tsd.ts"
12+
],
13+
"emittedFiles": [
14+
"FieldManager.js",
15+
"../../../typings/tsd.js"
16+
]
17+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"FieldManager.ts",
6+
"../../../typings/tsd.ts"
7+
],
8+
"resolvedInputFiles": [
9+
"lib.d.ts",
10+
"FieldManager.ts",
11+
"../../../typings/tsd.ts"
12+
],
13+
"emittedFiles": [
14+
"FieldManager.js",
15+
"../../../typings/tsd.js"
16+
]
17+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../../../typings/tsd.d.ts" />
2+
declare class FieldManager {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/FieldManager.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path="../../../typings/tsd.ts" />
2+
var FieldManager = (function () {
3+
function FieldManager() {
4+
}
5+
return FieldManager;
6+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile0.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
2+
// This is tsd.ts
3+
var tsd = (function () {
4+
function tsd() {
5+
}
6+
return tsd;
7+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/diskFile1.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.d.ts" />
2+
declare class tsd {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"../../../src/ts/Manager/FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true,
9+
"resolvedInputFiles": [
10+
"lib.d.ts",
11+
"../../../typings/tsd.ts",
12+
"../../../src/ts/Manager/FieldManager.ts"
13+
],
14+
"emittedFiles": [
15+
"../../../typings/tsd.js",
16+
"../../../typings/tsd.d.ts",
17+
"../../../src/ts/Manager/FieldManager.js",
18+
"../../../src/ts/Manager/FieldManager.d.ts"
19+
]
20+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../../../typings/tsd.d.ts" />
2+
declare class FieldManager {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/FieldManager.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/// <reference path="../../../typings/tsd.ts" />
2+
var FieldManager = (function () {
3+
function FieldManager() {
4+
}
5+
return FieldManager;
6+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile0.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.ts" />
2+
// This is tsd.ts
3+
var tsd = (function () {
4+
function tsd() {
5+
}
6+
return tsd;
7+
})();

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/diskFile1.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/// <reference path="../src/ts/Manager/FieldManager.d.ts" />
2+
declare class tsd {
3+
}

‎tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_RelativepathToFieldManager",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"../../../src/ts/Manager/FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true,
9+
"resolvedInputFiles": [
10+
"lib.d.ts",
11+
"../../../typings/tsd.ts",
12+
"../../../src/ts/Manager/FieldManager.ts"
13+
],
14+
"emittedFiles": [
15+
"../../../typings/tsd.js",
16+
"../../../typings/tsd.d.ts",
17+
"../../../src/ts/Manager/FieldManager.js",
18+
"../../../src/ts/Manager/FieldManager.d.ts"
19+
]
20+
}

‎tests/cases/project/referenceResolutionRelativePaths.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true
9+
}

‎tests/cases/project/referenceResolutionRelativePathsFromRootDirectory.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_FromRootDirectory",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution",
4+
"inputFiles": [
5+
"src/ts/Manager/FieldManager.ts"
6+
],
7+
"declaration": true,
8+
"baselineCheck": true
9+
}

‎tests/cases/project/referenceResolutionRelativePathsNoResolve.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"scenario": "referenceResolution1_FromFieldManagerFolder_NoResolve",
3+
"projectRoot": "tests/cases/projects/ReferenceResolution/src/ts/Manager",
4+
"inputFiles": [
5+
"FieldManager.ts",
6+
"../../../typings/tsd.ts"
7+
],
8+
"noResolve": true
9+
}

0 commit comments

Comments
 (0)