Change test injector constructor.

Author: e2l3n

test/project-service.ts

@@ -4,24 +4,26 @@
 import yok = require('../lib/common/yok');
 import stubs = require('./stubs');
 import * as constants from "./../lib/constants";
-import {ChildProcess} from "../lib/common/child-process";
+import * as ChildProcessLib from "../lib/common/child-process";
 import * as ProjectServiceLib from "../lib/services/project-service";
 import * as ProjectDataServiceLib from "../lib/services/project-data-service";
 import * as ProjectDataLib from "../lib/project-data";
 import * as ProjectHelperLib from "../lib/common/project-helper";
-import {StaticConfig} from "../lib/config";
+import * as ConfigLib from "../lib/config";
 import * as NpmLib from "../lib/node-package-manager";
 import {NpmInstallationManager} from "../lib/npm-installation-manager";
 import * as HttpClientLib from "../lib/common/http-client";
-import {FileSystem} from "../lib/common/file-system";
+import * as FileSystemLib from "../lib/common/file-system";
 import * as path from "path";
 import temp = require("temp");
 import * as helpers from "../lib/common/helpers";
 import {assert} from "chai";
-import {Options} from "../lib/options";
-import {HostInfo} from "../lib/common/host-info";
-import {IOSProjectService} from "../lib/services/ios-project-service";
+import * as OptionsLib from "../lib/options";
+import * as HostInfoLib from "../lib/common/host-info";
+import * as iOSProjectServiceLib from "../lib/services/ios-project-service";
 import * as shell from "shelljs";
+import ErrorsLib = require("../lib/common/errors");
+
 
 let mockProjectNameValidator = {
 	validate: () => { return true; }
@@ -104,25 +106,25 @@ class ProjectIntegrationTest {
 
 	private createTestInjector(): void {
 		this.testInjector = new yok.Yok();
-		this.testInjector.register("childProcess", ChildProcess);
+		this.testInjector.register("childProcess", ChildProcessLib.ChildProcess);
 		this.testInjector.register("errors", stubs.ErrorsStub);
 		this.testInjector.register('logger', stubs.LoggerStub);
 		this.testInjector.register("projectService", ProjectServiceLib.ProjectService);
 		this.testInjector.register("projectHelper", ProjectHelperLib.ProjectHelper);
 		this.testInjector.register("projectTemplatesService", stubs.ProjectTemplatesService);
 		this.testInjector.register("projectNameValidator", mockProjectNameValidator);
 
-		this.testInjector.register("fs", FileSystem);
+		this.testInjector.register("fs", FileSystemLib.FileSystem);
 		this.testInjector.register("projectDataService", ProjectDataServiceLib.ProjectDataService);
-		this.testInjector.register("staticConfig", StaticConfig);
+		this.testInjector.register("staticConfig", ConfigLib.StaticConfig);
 
 		this.testInjector.register("npmInstallationManager", NpmInstallationManager);
 		this.testInjector.register("npm", NpmLib.NodePackageManager);
 		this.testInjector.register("httpClient", HttpClientLib.HttpClient);
 		this.testInjector.register("lockfile", stubs.LockFile);
 
-		this.testInjector.register("options", Options);
-		this.testInjector.register("hostInfo", HostInfo);
+		this.testInjector.register("options", OptionsLib.Options);
+		this.testInjector.register("hostInfo", HostInfoLib.HostInfo);
 	}
 }
 
@@ -204,51 +206,44 @@ function createTestInjector() {
 	testInjector.register("projectHelper", ProjectHelperLib.ProjectHelper);
 	testInjector.register("projectTemplatesService", stubs.ProjectTemplatesService);
 	testInjector.register("projectNameValidator", mockProjectNameValidator);
-
-	testInjector.register("fs", FileSystem);
+	testInjector.register("fs", FileSystemLib.FileSystem);
 	testInjector.register("projectDataService", ProjectDataServiceLib.ProjectDataService);
-
-	testInjector.register("staticConfig", StaticConfig);
-
+	testInjector.register("staticConfig", ConfigLib.StaticConfig);
 	testInjector.register("npmInstallationManager", NpmInstallationManager);
 	testInjector.register("httpClient", HttpClientLib.HttpClient);
 	testInjector.register("lockfile", stubs.LockFile);
-
-	testInjector.register("childProcess", ChildProcess);
-
+	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
 	testInjector.register('projectData', ProjectDataLib.ProjectData);
-	testInjector.register("options", Options);
-	testInjector.register("hostInfo", HostInfo);
+	testInjector.register("options", OptionsLib.Options);
+	testInjector.register("hostInfo", HostInfoLib.HostInfo);
 
 	return testInjector;
 }
 
 function createInjectorForPodsTest() {
 	let testInjector = new yok.Yok();
-
-	testInjector.register("errors", stubs.ErrorsStub);
-	testInjector.register('logger', stubs.LoggerStub);
-	testInjector.register("projectHelper", {});
+	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
+	testInjector.register("config", ConfigLib.Configuration);
+	testInjector.register("errors", ErrorsLib.Errors);
+	testInjector.register("fs", FileSystemLib.FileSystem);
+	testInjector.register("hostInfo", HostInfoLib.HostInfo);
+	testInjector.register("injector", testInjector);
+	testInjector.register("iOSEmulatorServices", {});
+	testInjector.register("iOSProjectService", iOSProjectServiceLib.IOSProjectService);
+	testInjector.register("options", OptionsLib.Options);
 	testInjector.register("projectData", {
 		projectName: "__PROJECT_NAME__",
 		platformsDir: ""
 	});
+	testInjector.register("projectHelper", {});
+	testInjector.register("staticConfig", ConfigLib.StaticConfig);
 	testInjector.register("projectDataService", {});
-	testInjector.register("iOSEmulatorServices", {});
+	testInjector.register("prompter", {});
+	testInjector.register('logger', stubs.LoggerStub);
 	testInjector.register("config", {
 		"USE_POD_SANDBOX": true
 	});
-	testInjector.register("prompter", {});
-	testInjector.register("fs", FileSystem);
-	testInjector.register("staticConfig", StaticConfig);
 	testInjector.register("npmInstallationManager", NpmInstallationManager);
-	testInjector.register("iOSProjectService", IOSProjectService);
-	testInjector.register("projectService", ProjectServiceLib.ProjectService);
-	testInjector.register("projectTemplatesService", stubs.ProjectTemplatesService);
-	testInjector.register("projectNameValidator", mockProjectNameValidator);
-	testInjector.register("options", Options);
-	testInjector.register("hostInfo", HostInfo);
-	testInjector.register("childProcess", ChildProcess);
 
 	return testInjector;
 }