Move test folder to project root (#519)

Author: itoys

Diff for: .npmignore

@@ -2,6 +2,7 @@
 
 node_modules/
 src/
+test/
 .vscode-test/
 
 tools/

Diff for: .vscodeignore

@@ -4,6 +4,7 @@
 .vscode-test/**
 .gitignore
 src/**
+test/**
 out/test/**
 **/*.js.map
 SampleApplication/**

Diff for: gulpfile.js

@@ -23,12 +23,13 @@ var imports = GulpExtras.checkImports;
 var executeCommand = GulpExtras.executeCommand;
 
 var srcPath = "src";
+var testPath = "test";
 var outPath = "out";
 
 var sources = [
     srcPath,
-].map(function (tsFolder) { return tsFolder + "/**/*.ts"; })
-    .concat(["test/*.ts"]);
+    testPath,
+].map(function (tsFolder) { return tsFolder + "/**/*.ts"; });
 
 var knownOptions = {
     string: "env",
@@ -76,10 +77,11 @@ gulp.task("default", function (callback) {
 
 var lintSources = [
     srcPath,
+    testPath
 ].map(function (tsFolder) { return tsFolder + "/**/*.ts"; });
 lintSources = lintSources.concat([
     "!src/typings/**",
-    "!src/test/resources/sampleReactNative022Project/**",
+    "!test/resources/sampleReactNative022Project/**",
 ]);
 
 var libtslint = require("tslint");
@@ -167,7 +169,7 @@ gulp.task("check-copyright", function (cb) {
         "!node_modules/**",
         "!out/test/**/*.js",
         "!SampleApplication/**",
-        "!src/test/resources/sampleReactNative022Project/**/*.js",
+        "!test/resources/sampleReactNative022Project/**/*.js",
     ])
         .pipe(copyright());
 });

Diff for: src/common/error/errorHelper.ts

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
-import * as path from "path";
 import {InternalError, NestedError, InternalErrorLevel} from "./internalError";
 import {InternalErrorCode} from "./internalErrorCode";
+import {ERROR_STRINGS} from "./errorStrings";
 
 export class ErrorHelper {
-    private static errorStringsJsonLoc = path.resolve(__dirname, "..", "..", "..", "errorStrings", "errorStrings.json");
+    public static ERROR_STRINGS = ERROR_STRINGS;
     public static getInternalError(errorCode: InternalErrorCode, ...optionalArgs: any[]): InternalError {
         let message = ErrorHelper.getErrorMessage(errorCode, ...optionalArgs);
         return new InternalError(<number> errorCode, message);
@@ -29,8 +29,7 @@ export class ErrorHelper {
     }
 
     private static getErrorMessage(errorCode: InternalErrorCode, ...optionalArgs: any[]): string {
-        let errorStrings = require (ErrorHelper.errorStringsJsonLoc);
-        return ErrorHelper.formatErrorMessage(errorStrings[InternalErrorCode[errorCode]], ...optionalArgs);
+        return ErrorHelper.formatErrorMessage(ErrorHelper.ERROR_STRINGS[InternalErrorCode[errorCode]], ...optionalArgs);
     }
 
     private static formatErrorMessage(errorMessage: string, ...optionalArgs: any[]): string {

Diff for: errorStrings/errorStrings.json renamed to src/common/error/errorStrings.ts

@@ -1,4 +1,7 @@
-{
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for details.
+
+export const ERROR_STRINGS = {
     "CommandFailed": "Error while executing command '{0}'",
     "CommandFailedWithErrorCode": "Command '{0}' failed with error code {1}",
     "ExpectedIntegerValue": "Expected an integer. Couldn't read {0}",
@@ -14,7 +17,7 @@
     "PlatformNotSupported": "Platform '{0}' is not supported on host platform: {1}",
     "ProjectVersionNotParsable": "Couldn't parse the version component of the package at {0}: version = {1}",
     "ProjectVersionUnsupported": "Project version = {0}",
-    "ProjectVersionNotReadable":"Unable to read version = {0}",
+    "ProjectVersionNotReadable": "Unable to read version = {0}",
     "TelemetryInitializationFailed": "{0}. Couldn't initialize telemetry",
     "ExtensionActivationFailed": "Failed to activate the React Native Tools extension",
     "DebuggerStubLauncherFailed": "Failed to setup the stub launcher for the debugger",
@@ -32,5 +35,5 @@
     "CouldNotFindLocationOfNodeDebugger": "Couldn't find the location of the node-debugger extension",
     "PackagerRunningInDifferentPort": "A packager cannot be started on port {0} because a packager process is already running on port {1}",
     "ErrorWhileProcessingMessageInIPMSServer": "An error ocurred while handling message: {0}",
-    "ErrorNoPipeFound": "Unable to set up communication with VSCode react-native extension. Is this a react-native project, and have you made sure that the react-native npm package is installed at the root?"
-}
+    "ErrorNoPipeFound": "Unable to set up communication with VSCode react-native extension. Is this a react-native project, and have you made sure that the react-native npm package is installed at the root?",
+};

Diff for: src/common/error/internalErrorCode.ts

@@ -16,7 +16,7 @@ export enum InternalErrorCode {
         FailedToPublishToExpHost = 111,
 
         // Device Deployer errors
-        IDeviceInstallerNotFound = 201,
+        IOSDeployNotFound = 201,
 
         // Device Runner errors
         DeviceNotPluggedIn = 301,

Diff for: src/common/ios/iOSPlatform.ts

@@ -13,10 +13,7 @@ import {PlistBuddy} from "../../common/ios/plistBuddy";
 import {IOSDebugModeManager} from "../../common/ios/iOSDebugModeManager";
 import {OutputVerifier, PatternToFailure} from "../../common/outputVerifier";
 import {RemoteExtension} from "../../common/remoteExtension";
-
-/* tslint:disable:no-var-requires */
-const ErrorStrings = require("../../../errorStrings/errorStrings.json");
-/* tslint:enable:no-var-requires */
+import {ErrorHelper} from "../../common/error/errorHelper";
 
 export class IOSPlatform extends GeneralMobilePlatform {
     public static DEFAULT_IOS_PROJECT_RELATIVE_PATH = "ios";
@@ -33,13 +30,13 @@ export class IOSPlatform extends GeneralMobilePlatform {
     // We should add the common iOS build/run erros we find to this list
     private static RUN_IOS_FAILURE_PATTERNS: PatternToFailure[] = [{
         pattern: "No devices are booted",
-        message: ErrorStrings.IOSSimulatorNotLaunchable,
+        message: ErrorHelper.ERROR_STRINGS.IOSSimulatorNotLaunchable,
     }, {
         pattern: "FBSOpenApplicationErrorDomain",
-        message: ErrorStrings.IOSSimulatorNotLaunchable,
+        message: ErrorHelper.ERROR_STRINGS.IOSSimulatorNotLaunchable,
     }, {
         pattern: "ios-deploy",
-        message: ErrorStrings.IOSDeployNotFound,
+        message: ErrorHelper.ERROR_STRINGS.IOSDeployNotFound,
     }];
 
     private static RUN_IOS_SUCCESS_PATTERNS = ["BUILD SUCCEEDED"];

Diff for: src/common/node/childProcess.ts

@@ -7,7 +7,7 @@ import {ErrorHelper} from "../error/errorHelper";
 import {InternalErrorCode} from "../error/internalErrorCode";
 
 // Uncomment the following lines to record all spawned processes executions
-// import {Recorder} from "../../test/resources/processExecution/recorder";
+// import {Recorder} from "../../../test/resources/processExecution/recorder";
 // Recorder.installGlobalRecorder();
 
 export interface IExecResult {

Diff for: src/extension/commandPaletteHandler.ts

@@ -77,7 +77,7 @@ export class CommandPaletteHandler {
      */
     public publishToExpHost(): Q.Promise<void> {
         return this.executeCommandInContext("publishToExpHost", () => {
-            this.executePublishToExpHost().then((didPublish) => {
+            return this.executePublishToExpHost().then((didPublish) => {
                 if (!didPublish) {
                     Log.logMessage("Publishing was unsuccessful. Please make sure you are logged in Exponent and your project is a valid Exponentjs project");
                 }
@@ -164,7 +164,7 @@ export class CommandPaletteHandler {
      * Otherwise, displays an error message banner
      * {operation} - a function that performs the expected operation
      */
-    private executeCommandInContext(rnCommand: string, operation: () => Q.Promise<void> | void): Q.Promise<void> {
+    private executeCommandInContext(rnCommand: string, operation: () => Q.Promise<void>): Q.Promise<void> {
         let reactNativeProjectHelper = new ReactNativeProjectHelper(this.workspaceRoot);
         return TelemetryHelper.generate("RNCommand", (generator) => {
             generator.add("command", rnCommand, false);
@@ -178,6 +178,7 @@ export class CommandPaletteHandler {
                     return operation();
                 } else {
                     vscode.window.showErrorMessage("Current workspace is not a React Native project.");
+                    return;
                 }
             });
         });

Diff for: src/test/common/commandExecutor.test.ts renamed to test/common/commandExecutor.test.ts

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
-import {CommandExecutor} from "../../common/commandExecutor";
-import { Log } from "../../common/log/log";
+import {CommandExecutor} from "../../src/common/commandExecutor";
+import { Log } from "../../src/common/log/log";
 
-import { Node } from "../../common/node/node";
-import { ChildProcess } from "../../common/node/childProcess";
+import { Node } from "../../src/common/node/node";
+import { ChildProcess } from "../../src/common/node/childProcess";
 
 
 import { EventEmitter } from "events";

Diff for: src/test/common/extensionMessaging.test.ts renamed to test/common/extensionMessaging.test.ts

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
 
-import {ExtensionMessage, MessagingChannel} from "../../common/extensionMessaging";
+import {ExtensionMessage, MessagingChannel} from "../../src/common/extensionMessaging";
 
-import {RemoteExtension} from "../../common/remoteExtension";
+import {RemoteExtension} from "../../src/common/remoteExtension";
 
-import {InterProcessMessageSender} from "../../common/interProcessMessageSender";
+import {InterProcessMessageSender} from "../../src/common/interProcessMessageSender";
 
 import * as assert from "assert";
 import * as net from "net";