Fix ui tests for platform service and safeguard missing id.

Author: KristianDD

lib/project-data.ts

@@ -32,11 +32,11 @@ export class ProjectData implements IProjectData {
 	public projectFilePath: string;
 	public projectIdentifiers: IProjectIdentifier;
 	get projectId(): string {
-		this.$logger.warnWithLabel("This propery is depricated. Please use projectData.projectIdentifiers[platform].");
+		this.warnProjectId();
 		return this.projectIdentifiers.ios;
 	}
 	set projectId(identifier: string) {
-		this.$logger.warnWithLabel("This propery is depricated. Please use projectData.projectIdentifiers[platform].");
+		this.warnProjectId();
 		this.projectIdentifiers.ios = identifier;
 		this.projectIdentifiers.android = identifier;
 	}
@@ -56,6 +56,7 @@ export class ProjectData implements IProjectData {
 
 	public initializeProjectData(projectDir?: string): void {
 		projectDir = projectDir || this.$projectHelper.projectDir;
+
 		// If no project found, projectDir should be null
 		if (projectDir) {
 			const projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
@@ -79,10 +80,7 @@ export class ProjectData implements IProjectData {
 					this.projectFilePath = projectFilePath;
 					this.appDirectoryPath = path.join(projectDir, constants.APP_FOLDER_NAME);
 					this.appResourcesDirectoryPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME);
-					this.projectIdentifiers = {
-						android: data.id.android || data.id,
-						ios: data.id.ios || data.id
-					};
+					this.projectIdentifiers = this.getProjectIdentifiers(data.id);
 					this.dependencies = fileContent.dependencies;
 					this.devDependencies = fileContent.devDependencies;
 					this.projectType = this.getProjectType();
@@ -99,6 +97,25 @@ export class ProjectData implements IProjectData {
 		this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir || this.$options.path || currentDir);
 	}
 
+	private getProjectIdentifiers(data :any): IProjectIdentifier {
+		let identifier: IProjectIdentifier;
+		data = data || "";
+		
+		if(typeof data === "string") {
+			identifier = {
+				android: data,
+				ios: data
+			};
+		} else {
+			identifier = {
+				android: data.android || "",
+				ios: data.ios || ""
+			};
+		}
+
+		return identifier;
+	}
+
 	private getProjectType(): string {
 		let detectedProjectType = _.find(ProjectData.PROJECT_TYPES, (projectType) => projectType.isDefaultProjectType).type;
 
@@ -113,5 +130,9 @@ export class ProjectData implements IProjectData {
 
 		return detectedProjectType;
 	}
+
+	private warnProjectId(): void {
+		this.$logger.warnWithLabel("IProjectData.projectId is depricated. Please use IProjectData.projectIdentifiers[platform].");
+	}
 }
 $injector.register("projectData", ProjectData);

lib/services/project-service.ts

@@ -80,7 +80,7 @@ export class ProjectService implements IProjectService {
 	public isValidNativeScriptProject(pathToProject?: string): boolean {
 		try {
 			this.$projectData.initializeProjectData(pathToProject);
-			return !!this.$projectData.projectDir && !!this.$projectData.projectIdentifiers;
+			return !!this.$projectData.projectDir && !!(this.$projectData.projectIdentifiers.ios && this.$projectData.projectIdentifiers.android);
 		} catch (e) {
 			return false;
 		}

test/platform-service.ts

@@ -367,6 +367,7 @@ describe('Platform Service Tests', () => {
 			testInjector = createTestInjector();
 			testInjector.register("fs", fsLib.FileSystem);
 			fs = testInjector.resolve("fs");
+			testInjector.resolve("projectData").initializeProjectData();
 		});
 
 		function prepareDirStructure() {