From 30fe3f7221304b4338ee6582cd86370e9a371e29 Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Thu, 16 Oct 2014 18:13:26 -0700
Subject: [PATCH] Fix runtests for unittests

---
 Jakefile                                       | 8 ++++++--
 tests/cases/unittests/services/colorization.ts | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Jakefile b/Jakefile
index 1709e1f7628..790a5f3546d 100644
--- a/Jakefile
+++ b/Jakefile
@@ -10,6 +10,7 @@ var servicesDirectory = "src/services/";
 var harnessDirectory = "src/harness/";
 var libraryDirectory = "src/lib/";
 var scriptsDirectory = "scripts/";
+var unittestsDirectory = "tests/cases/unittests/";
 var docDirectory = "doc/";
 
 var builtDirectory = "built/";
@@ -74,13 +75,16 @@ var harnessSources = [
     "typeWriter.ts",
     "fourslashRunner.ts",
     "projectsRunner.ts",
-    "unittestrunner.ts",
     "loggedIO.ts",
     "rwcRunner.ts",
     "runner.ts"
 ].map(function (f) {
     return path.join(harnessDirectory, f);
-});
+}).concat([
+    "services/colorization.ts"
+].map(function (f) {
+    return path.join(unittestsDirectory, f);
+}));
 
 var librarySourceMap = [
         { target: "lib.core.d.ts", sources: ["core.d.ts"] },
diff --git a/tests/cases/unittests/services/colorization.ts b/tests/cases/unittests/services/colorization.ts
index ee5350a25eb..ec44492db5d 100644
--- a/tests/cases/unittests/services/colorization.ts
+++ b/tests/cases/unittests/services/colorization.ts
@@ -1,4 +1,7 @@
-interface Classification {
+/// <reference path="..\..\..\..\src\harness\external\mocha.d.ts" />
+/// <reference path="..\..\..\..\src\harness\harnessLanguageService.ts" />
+
+interface Classification {
     position: number;
     length: number;
     class: ts.TokenClass;
@@ -66,7 +69,7 @@ describe('Colorization', function () {
     function numberLiteral(text: string) { return { value: text, class: ts.TokenClass.NumberLiteral }; }
     function stringLiteral(text: string) { return { value: text, class: ts.TokenClass.StringLiteral }; }
     function regExpLiteral(text: string) { return { value: text, class: ts.TokenClass.RegExpLiteral }; }
-    function finalEndOfLineState(value: number) { return { value: value, class: undefined }; }
+    function finalEndOfLineState(value: number) { return { value: value, class: <ts.TokenClass>undefined }; }
 
     function test(text: string, initialEndOfLineState: ts.EndOfLineState, ...expectedEntries: ClassificationEntry[]): void {
         var result = getClassifications(text, initialEndOfLineState);
@@ -265,7 +268,7 @@ describe('Colorization', function () {
                 identifier("Foo"),
                 operator("<"),
                 identifier("Foo"),
-                operator(">"
+                operator(">"),
                 identifier("keyword"),
                 finalEndOfLineState(ts.EndOfLineState.Start));
         });