Skip to content

Commit cfe3aad

Browse files
weswighamweswigham
committed
Move unittests into harness
1 parent fb20df0 commit cfe3aad

112 files changed

Lines changed: 49 additions & 50 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Gulpfile.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,7 @@ const lintTargets = [
944944
"Gulpfile.ts",
945945
"src/compiler/**/*.ts",
946946
"src/harness/**/*.ts",
947-
"tests/cases/unittests/**/*.ts",
948-
"!tests/cases/unittests/services/formatting/**/*.ts",
947+
"!src/harness/unittests/services/formatting/**/*.ts",
949948
"src/server/**/*.ts",
950949
"scripts/tslint/**/*.ts",
951950
"src/services/**/*.ts",

‎Jakefile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var serverDirectory = "src/server/";
1414
var harnessDirectory = "src/harness/";
1515
var libraryDirectory = "src/lib/";
1616
var scriptsDirectory = "scripts/";
17-
var unittestsDirectory = "tests/cases/unittests/";
17+
var unittestsDirectory = "src/harness/unittests/";
1818
var docDirectory = "doc/";
1919

2020
var builtDirectory = "built/";

‎src/harness/tsconfig.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,24 +70,24 @@
7070
"../server/session.ts",
7171
"../server/client.ts",
7272
"../server/editorServices.ts",
73-
"../../tests/cases/unittests/incrementalParser.ts",
74-
"../../tests/cases/unittests/jsDocParsing.ts",
75-
"../../tests/cases/unittests/services/colorization.ts",
76-
"../../tests/cases/unittests/services/documentRegistry.ts",
77-
"../../tests/cases/unittests/services/preProcessFile.ts",
78-
"../../tests/cases/unittests/services/patternMatcher.ts",
79-
"../../tests/cases/unittests/session.ts",
80-
"../../tests/cases/unittests/versionCache.ts",
81-
"../../tests/cases/unittests/convertToBase64.ts",
82-
"../../tests/cases/unittests/transpile.ts",
83-
"../../tests/cases/unittests/reuseProgramStructure.ts",
84-
"../../tests/cases/unittests/cachingInServerLSHost.ts",
85-
"../../tests/cases/unittests/moduleResolution.ts",
86-
"../../tests/cases/unittests/tsconfigParsing.ts",
87-
"../../tests/cases/unittests/commandLineParsing.ts",
88-
"../../tests/cases/unittests/convertCompilerOptionsFromJson.ts",
89-
"../../tests/cases/unittests/convertTypingOptionsFromJson.ts",
90-
"../../tests/cases/unittests/tsserverProjectSystem.ts",
91-
"../../tests/cases/unittests/matchFiles.ts"
73+
"./unittests/incrementalParser.ts",
74+
"./unittests/jsDocParsing.ts",
75+
"./unittests/services/colorization.ts",
76+
"./unittests/services/documentRegistry.ts",
77+
"./unittests/services/preProcessFile.ts",
78+
"./unittests/services/patternMatcher.ts",
79+
"./unittests/session.ts",
80+
"./unittests/versionCache.ts",
81+
"./unittests/convertToBase64.ts",
82+
"./unittests/transpile.ts",
83+
"./unittests/reuseProgramStructure.ts",
84+
"./unittests/cachingInServerLSHost.ts",
85+
"./unittests/moduleResolution.ts",
86+
"./unittests/tsconfigParsing.ts",
87+
"./unittests/commandLineParsing.ts",
88+
"./unittests/convertCompilerOptionsFromJson.ts",
89+
"./unittests/convertTypingOptionsFromJson.ts",
90+
"./unittests/tsserverProjectSystem.ts",
91+
"./unittests/matchFiles.ts"
9292
]
9393
}

tests/cases/unittests/cachingInServerLSHost.ts renamed to src/harness/unittests/cachingInServerLSHost.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="..\..\..\src\harness\harness.ts" />
1+
/// <reference path="..\harness.ts" />
22

33
namespace ts {
44
interface File {

tests/cases/unittests/commandLineParsing.ts renamed to src/harness/unittests/commandLineParsing.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="..\..\..\src\harness\harness.ts" />
2-
/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
1+
/// <reference path="..\harness.ts" />
2+
/// <reference path="..\..\compiler\commandLineParser.ts" />
33

44
namespace ts {
55
describe("parseCommandLine", () => {

tests/cases/unittests/convertCompilerOptionsFromJson.ts renamed to src/harness/unittests/convertCompilerOptionsFromJson.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="..\..\..\src\harness\harness.ts" />
2-
/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
1+
/// <reference path="..\harness.ts" />
2+
/// <reference path="..\..\compiler\commandLineParser.ts" />
33

44
namespace ts {
55
describe("convertCompilerOptionsFromJson", () => {

tests/cases/unittests/convertToBase64.ts renamed to src/harness/unittests/convertToBase64.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <reference path="..\..\..\src\harness\harness.ts" />
1+
/// <reference path="..\harness.ts" />
22

33
namespace ts {
44
describe("convertToBase64", () => {

tests/cases/unittests/convertTypingOptionsFromJson.ts renamed to src/harness/unittests/convertTypingOptionsFromJson.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="..\..\..\src\harness\harness.ts" />
2-
/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
1+
/// <reference path="..\harness.ts" />
2+
/// <reference path="..\..\compiler\commandLineParser.ts" />
33

44
namespace ts {
55
describe("convertTypingOptionsFromJson", () => {

tests/cases/unittests/incrementalParser.ts renamed to src/harness/unittests/incrementalParser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="..\..\..\src\harness\harness.ts" />
2-
/// <reference path="..\..\..\src\compiler\parser.ts" />
1+
/// <reference path="..\harness.ts" />
2+
/// <reference path="..\..\compiler\parser.ts" />
33

44
namespace ts {
55
ts.disableIncrementalParsing = false;

tests/cases/unittests/jsDocParsing.ts renamed to src/harness/unittests/jsDocParsing.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/// <reference path="..\..\..\src\compiler\parser.ts" />
2-
/// <reference path="..\..\..\src\harness\harness.ts" />
1+
/// <reference path="..\..\compiler\parser.ts" />
2+
/// <reference path="..\harness.ts" />
33

44
namespace ts {
55
describe("JSDocParsing", () => {

0 commit comments

Comments
 (0)