Move unittests into harness

Author: weswigham

Gulpfile.ts

@@ -944,8 +944,7 @@ const lintTargets = [
     "Gulpfile.ts",
     "src/compiler/**/*.ts",
     "src/harness/**/*.ts",
-    "tests/cases/unittests/**/*.ts",
-    "!tests/cases/unittests/services/formatting/**/*.ts",
+    "!src/harness/unittests/services/formatting/**/*.ts",
     "src/server/**/*.ts",
     "scripts/tslint/**/*.ts",
     "src/services/**/*.ts",

Jakefile.js

@@ -14,7 +14,7 @@ var serverDirectory = "src/server/";
 var harnessDirectory = "src/harness/";
 var libraryDirectory = "src/lib/";
 var scriptsDirectory = "scripts/";
-var unittestsDirectory = "tests/cases/unittests/";
+var unittestsDirectory = "src/harness/unittests/";
 var docDirectory = "doc/";
 
 var builtDirectory = "built/";

src/harness/tsconfig.json

@@ -70,24 +70,24 @@
         "../server/session.ts",
         "../server/client.ts",
         "../server/editorServices.ts",
-        "../../tests/cases/unittests/incrementalParser.ts",
-        "../../tests/cases/unittests/jsDocParsing.ts",
-        "../../tests/cases/unittests/services/colorization.ts",
-        "../../tests/cases/unittests/services/documentRegistry.ts",
-        "../../tests/cases/unittests/services/preProcessFile.ts",
-        "../../tests/cases/unittests/services/patternMatcher.ts",
-        "../../tests/cases/unittests/session.ts",
-        "../../tests/cases/unittests/versionCache.ts",
-        "../../tests/cases/unittests/convertToBase64.ts",
-        "../../tests/cases/unittests/transpile.ts",
-        "../../tests/cases/unittests/reuseProgramStructure.ts",
-        "../../tests/cases/unittests/cachingInServerLSHost.ts",
-        "../../tests/cases/unittests/moduleResolution.ts",
-        "../../tests/cases/unittests/tsconfigParsing.ts",
-        "../../tests/cases/unittests/commandLineParsing.ts",
-        "../../tests/cases/unittests/convertCompilerOptionsFromJson.ts",
-        "../../tests/cases/unittests/convertTypingOptionsFromJson.ts",
-        "../../tests/cases/unittests/tsserverProjectSystem.ts",
-        "../../tests/cases/unittests/matchFiles.ts"
+        "./unittests/incrementalParser.ts",
+        "./unittests/jsDocParsing.ts",
+        "./unittests/services/colorization.ts",
+        "./unittests/services/documentRegistry.ts",
+        "./unittests/services/preProcessFile.ts",
+        "./unittests/services/patternMatcher.ts",
+        "./unittests/session.ts",
+        "./unittests/versionCache.ts",
+        "./unittests/convertToBase64.ts",
+        "./unittests/transpile.ts",
+        "./unittests/reuseProgramStructure.ts",
+        "./unittests/cachingInServerLSHost.ts",
+        "./unittests/moduleResolution.ts",
+        "./unittests/tsconfigParsing.ts",
+        "./unittests/commandLineParsing.ts",
+        "./unittests/convertCompilerOptionsFromJson.ts",
+        "./unittests/convertTypingOptionsFromJson.ts",
+        "./unittests/tsserverProjectSystem.ts",
+        "./unittests/matchFiles.ts"
     ]
 }

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

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\harness.ts" />
 
 namespace ts {
     interface File {

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

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\compiler\commandLineParser.ts" />
 
 namespace ts {
     describe("parseCommandLine", () => {

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

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\compiler\commandLineParser.ts" />
 
 namespace ts {
     describe("convertCompilerOptionsFromJson", () => {

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

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\harness.ts" />
 
 namespace ts {
     describe("convertToBase64", () => {

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

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\compiler\commandLineParser.ts" />
 
 namespace ts {
     describe("convertTypingOptionsFromJson", () => {

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

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\compiler\parser.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\compiler\parser.ts" />
 
 namespace ts {
     ts.disableIncrementalParsing = false;

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

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\compiler\parser.ts" />
-/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\..\compiler\parser.ts" />
+/// <reference path="..\harness.ts" />
 
 namespace ts {
     describe("JSDocParsing", () => {

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

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\harness\virtualFileSystem.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\virtualFileSystem.ts" />
 
 namespace ts {
     const caseInsensitiveBasePath = "c:/dev/";

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

@@ -1,4 +1,4 @@
-/// <reference path='..\..\..\src\harness\harness.ts' />
+/// <reference path="..\harness.ts" />
 
 namespace ts {
     function diagnosticToString(diagnostic: Diagnostic) {

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

@@ -1,5 +1,5 @@
-/// <reference path='..\..\..\src\harness\harness.ts' />
-/// <reference path="..\..\..\src\harness\harnessLanguageService.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\harness\harnessLanguageService.ts" />
 
 namespace ts {
 

tests/cases/unittests/services/colorization.ts renamed to src/harness/unittests/services/colorization.ts

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\..\src\harness\harnessLanguageService.ts" />
+/// <reference path="..\..\harnessLanguageService.ts" />
 
 interface ClassificationEntry {
     value: any;

tests/cases/unittests/services/documentRegistry.ts renamed to src/harness/unittests/services/documentRegistry.ts

@@ -1,4 +1,4 @@
-///<reference path='..\..\..\..\src\harness\harness.ts' />
+/// <reference path="..\..\harness.ts" />
 
 describe("DocumentRegistry", () => {
     it("documents are shared between projects", () => {

tests/cases/unittests/services/formatting/documentFormattingTests.json renamed to src/harness/unittests/services/formatting/documentFormattingTests.json

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\..\src\services\patternMatcher.ts" />
+/// <reference path="..\..\..\services\patternMatcher.ts" />
 
 describe("PatternMatcher", function () {
     describe("BreakIntoCharacterSpans", function () {

tests/cases/unittests/services/formatting/formatDiffTemplate.html renamed to src/harness/unittests/services/formatting/formatDiffTemplate.html

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\..\src\harness\harnessLanguageService.ts" />
+/// <reference path="..\..\harnessLanguageService.ts" />
 
 describe("PreProcessFile:", function () {
     function test(sourceText: string, readImportFile: boolean, detectJavaScriptImports: boolean, expectedPreProcess: ts.PreProcessedFileInfo): void {

tests/cases/unittests/services/formatting/getFormattingEditsForRange.ts renamed to src/harness/unittests/services/formatting/getFormattingEditsForRange.ts

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\harness.ts" />
 
 const expect: typeof _chai.expect = _chai.expect;
 

tests/cases/unittests/services/formatting/getSmartIndentAtLineNumber.ts renamed to src/harness/unittests/services/formatting/getSmartIndentAtLineNumber.ts

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\harness.ts" />
 
 namespace ts {
     describe("Transpile", () => {

tests/cases/unittests/services/formatting/importedJavaScriptFormatting.ts renamed to src/harness/unittests/services/formatting/importedJavaScriptFormatting.ts

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\compiler\commandLineParser.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\compiler\commandLineParser.ts" />
 
 namespace ts {
     describe("parseConfigFileTextToJson", () => {

tests/cases/unittests/services/formatting/ruleFormattingTests.json renamed to src/harness/unittests/services/formatting/ruleFormattingTests.json

@@ -1,4 +1,4 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
+/// <reference path="..\harness.ts" />
 
 namespace ts {
     function notImplemented(): any {

tests/cases/unittests/services/formatting/testCode/formatting/classes.ts renamed to src/harness/unittests/services/formatting/testCode/formatting/classes.ts

@@ -1,5 +1,5 @@
-/// <reference path="..\..\..\src\harness\harness.ts" />
-/// <reference path="..\..\..\src\server\editorServices.ts" />
+/// <reference path="..\harness.ts" />
+/// <reference path="..\..\server\editorServices.ts" />
 
 namespace ts {
     function editFlat(position: number, deletedLength: number, newText: string, source: string) {