Revert changes to unit tests

Author: rbuckton

Gulpfile.ts

@@ -625,21 +625,19 @@ function cleanPrivatePackage(packageName: string) {
     return del([`scripts/${packageName}/dist`]);
 }
 
-gulp.task("typemock", () => compilePrivatePackage("typemock"));
 gulp.task("vfs-core", () => compilePrivatePackage("vfs-core"));
 gulp.task("vfs-errors", () => compilePrivatePackage("vfs-errors"));
 gulp.task("vfs-path", ["vfs-core", "vfs-errors"], () => compilePrivatePackage("vfs-path"));
-gulp.task("vfs", ["vfs-core", "vfs-errors", "vfs-path", "typemock"], () => compilePrivatePackage("vfs"));
+gulp.task("vfs", ["vfs-core", "vfs-errors", "vfs-path"], () => compilePrivatePackage("vfs"));
 gulp.task("harness-core", ["vfs-core"], () => compilePrivatePackage("harness-core"));
-gulp.task("private-packages", ["typemock", "vfs", "harness-core"]);
+gulp.task("private-packages", ["vfs", "harness-core"]);
 
-gulp.task("clean:typemock", () => cleanPrivatePackage("typemock"));
 gulp.task("clean:vfs-core", () => cleanPrivatePackage("vfs-core"));
 gulp.task("clean:vfs-errors", () => cleanPrivatePackage("vfs-errors"));
 gulp.task("clean:vfs-path", ["clean:vfs-core", "clean:vfs-errors"], () => cleanPrivatePackage("vfs-path"));
-gulp.task("clean:vfs", ["clean:vfs-core", "clean:vfs-errors", "clean:vfs-path", "clean:typemock"], () => cleanPrivatePackage("vfs"));
+gulp.task("clean:vfs", ["clean:vfs-core", "clean:vfs-errors", "clean:vfs-path"], () => cleanPrivatePackage("vfs"));
 gulp.task("clean:harness-core", ["clean:vfs-core"], () => cleanPrivatePackage("harness-core"));
-gulp.task("clean:private-packages", ["clean:typemock", "clean:vfs", "clean:harness-core"]);
+gulp.task("clean:private-packages", ["clean:vfs", "clean:harness-core"]);
 
 // Task to build the tests infrastructure using the built compiler
 const run = path.join(builtLocalDirectory, "run.js");
@@ -1161,5 +1159,5 @@ gulp.task("lint", "Runs tslint on the compiler sources. Optional arguments are:
 gulp.task("default", "Runs 'local'", ["local"]);
 
 gulp.task("watch", "Watches the src/ directory for changes and executes runtests-parallel.", [], () => {
-    gulp.watch(["src/**/*.*", "scripts/typemock/src/**/*.*"], ["runtests-parallel"]);
+    gulp.watch(["src/**/*.*"], ["runtests-parallel"]);
 });

Jakefile.js

@@ -813,29 +813,27 @@ function privatePackage(packageName, prereqs) {
                 complete();
             }
             measure(startCompileTime);
-        });    
+        });
     }, { async: true });
 }
 
 function cleanPrivatePackage(packageName) {
     jake.rmRf(`scripts/${packageName}/dist`);
 }
 
-privatePackage("typemock");
 privatePackage("vfs-core");
 privatePackage("vfs-errors");
 privatePackage("vfs-path", ["vfs-core", "vfs-errors"]);
-privatePackage("vfs", ["vfs-path", "typemock"]);
+privatePackage("vfs", ["vfs-path"]);
 privatePackage("harness-core", ["vfs-core"]);
-task("private-packages", ["typemock", "vfs", "harness-core"]);
+task("private-packages", ["vfs", "harness-core"]);
 
-task("clean-typemock", () => cleanPrivatePackage("typemock"));
 task("clean-vfs-core", () => cleanPrivatePackage("vfs-core"));
 task("clean-vfs-errors", () => cleanPrivatePackage("vfs-errors"));
 task("clean-vfs-path", ["clean-vfs-core", "clean-vfs-errors"], () => cleanPrivatePackage("vfs-path"));
-task("clean-vfs", ["clean-vfs-path", "clean-typemock"], () => cleanPrivatePackage("vfs"));
+task("clean-vfs", ["clean-vfs-path"], () => cleanPrivatePackage("vfs"));
 task("clean-harness-core", ["clean-vfs-core"], () => cleanPrivatePackage("harness-core"));
-task("clean-private-packages", ["clean-typemock", "clean-vfs", "clean-harness-core"]);
+task("clean-private-packages", ["clean-vfs", "clean-harness-core"]);
 
 // Task to build the tests infrastructure using the built compiler
 var run = path.join(builtLocalDirectory, "run.js");
@@ -1337,7 +1335,7 @@ desc("Runs tslint on the compiler sources. Optional arguments are: f[iles]=regex
 task("lint", ["build-rules"], () => {
     if (fold.isTravis()) console.log(fold.start("lint"));
     const fileMatcher = process.env.f || process.env.file || process.env.files;
-    
+
     const files = fileMatcher
         ? `src/**/${fileMatcher}`
         : `Gulpfile.ts scripts/generateLocalizedDiagnosticMessages.ts "scripts/tslint/**/*.ts" "src/**/*.ts" --exclude "src/lib/*.d.ts"`;

package.json

@@ -85,7 +85,6 @@
         "travis-fold": "latest",
         "ts-node": "latest",
         "tslint": "latest",
-        "typemock": "file:scripts/typemock",
         "typescript": "next",
         "vinyl": "latest",
         "xml2js": "^0.4.19"