test debugging

Author: tailsu

.settings/tasks.json

@@ -3,13 +3,14 @@ test android
 
 Usage | Synopsis
 ------|-------
-General | `$ tns test android [--watch] [--device <Device ID>]`
+General | `$ tns test android [--watch] [--device <Device ID>] [--debug-brk]`
 
 Runs the tests in your project on connected Android devices and emulators.
 
 ### Options
 * `--watch` - If set, when you save changes to the project, changes are automatically synchronized to the connected device and tests are re-run.
 * `--device` - Specifies the serial number or the index of the connected device on which to run the tests. To list all connected devices, grouped by platform, run `$ tns device`
+* `--debug-brk` - Run the tests under the debugger. The debugger will break just before your tests are executed, so you have a chance to place breakpoints.
 
 ### Attributes
 * `<Device ID>` is the device index or identifier as listed by `$ tns device`

docs/man_pages/project/testing/test-android.md

@@ -3,18 +3,19 @@ test ios
 
 Usage | Synopsis
 ------|-------
-Run tests on all connected devices | `$ tns test ios [--watch]`
-Run tests on a selected device | `$ tns test ios --device <Device ID> [--watch]`
-Run tests in the iOS Simulator | `$ tns test ios --emulator [--watch]`
+Run tests on all connected devices | `$ tns test ios [--watch] [--debug-brk]`
+Run tests on a selected device | `$ tns test ios --device <Device ID> [--watch] [--debug-brk]`
+Run tests in the iOS Simulator | `$ tns test ios --emulator [--watch] [--debug-brk]`
 
 Runs the tests in your project on connected iOS devices or the iOS Simulator.
 
 ### Options
 * `--watch` - If set, when you save changes to the project, changes are automatically synchronized to the connected device and tests are re-ran.
 * `--device` - Specifies the serial number or the index of the connected device on which you want to run tests. To list all connected devices, grouped by platform, run `$ tns device`. You cannot set `--device` and `--emulator` simultaneously.
 * `--emulator` - Runs tests on the iOS Simulator. You cannot set `--device` and `--emulator` simultaneously.
+* `--debug-brk` - Run the tests under the debugger. The debugger will break just before your tests are executed, so you have a chance to place breakpoints.
 
-<% if(isHtml) { %> 
+<% if(isHtml) { %>
 ### Related commands
 Command | Description
 --------|------------

docs/man_pages/project/testing/test-ios.md

@@ -10,7 +10,7 @@ function RunTestCommandFactory(platform: string) {
 }
 
 $injector.registerCommand("dev-test|android",  RunTestCommandFactory('android'));
-$injector.registerCommand("dev-test|ios",  RunTestCommandFactory('ios'));
+$injector.registerCommand("dev-test|ios",  RunTestCommandFactory('iOS'));
 
 function RunKarmaTestCommandFactory(platform: string) {
 	return function RunKarmaTestCommand($testExecutionService: ITestExecutionService) {
@@ -20,4 +20,4 @@ function RunKarmaTestCommandFactory(platform: string) {
 }
 
 $injector.registerCommand("test|android", RunKarmaTestCommandFactory('android'));
-$injector.registerCommand("test|ios", RunKarmaTestCommandFactory('ios'));
+$injector.registerCommand("test|ios", RunKarmaTestCommandFactory('iOS'));

lib/commands/test.ts

@@ -1,3 +1,4 @@
 interface IDebugService {
 	debug(): IFuture<void>;
+	debugStart(): IFuture<void>;
 }

lib/common

@@ -135,16 +135,34 @@ class AndroidDebugService implements IDebugService {
                 this.device.applicationManager.uninstallApplication(packageName).wait();
                 this.device.applicationManager.installApplication(packageFile).wait();
             }
+            this.debugStartCore().wait();
+        }).future<void>()();
+    }
 
+    public debugStart(): IFuture<void> {
+        return (() => {
+            this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device}).wait();
+            let action = (device: Mobile.IAndroidDevice): IFuture<void> => {
+                this.device = device;
+                return this.debugStartCore();
+            };
+            this.$devicesServices.execute(action).wait();
+        }).future<void>()();
+    }
+
+    private debugStartCore(): IFuture<void> {
+        return (() => {
+            let packageName = this.$projectData.projectId;
             let packageDir = util.format(AndroidDebugService.PACKAGE_EXTERNAL_DIR_TEMPLATE, packageName);
             let envDebugOutFullpath = this.$mobileHelper.buildDevicePath(packageDir, AndroidDebugService.ENV_DEBUG_OUT_FILENAME);
 
             this.device.adb.executeShellCommand(["rm", `${envDebugOutFullpath}`]).wait();
             this.device.adb.executeShellCommand(["mkdir", "-p", `${packageDir}`]).wait();
 
-    		let debugBreakPath = this.$mobileHelper.buildDevicePath(packageDir, "debugbreak");
+            let debugBreakPath = this.$mobileHelper.buildDevicePath(packageDir, "debugbreak");
             this.device.adb.executeShellCommand([`cat /dev/null > ${debugBreakPath}`]).wait();
 
+            this.device.applicationManager.stopApplication(packageName).wait();
             this.device.applicationManager.startApplication(packageName).wait();
 
             let dbgPort = this.startAndGetPort(packageName).wait();

lib/definitions/debug.d.ts

@@ -152,31 +152,42 @@ class IOSDebugService implements IDebugService {
     private deviceDebugBrk(): IFuture<void> {
         return (() => {
             this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
-            this.$devicesServices.execute(device => (() => {
+            this.$devicesServices.execute((device: iOSDevice.IOSDevice) => (() => {
                 // we intentionally do not wait on this here, because if we did, we'd miss the AppLaunching notification
                 let deploy = this.$platformService.deployOnDevice(this.platform);
+                this.debugBrkCore(device).wait();
+                deploy.wait();
+            }).future<void>()()).wait();
+        }).future<void>()();
+    }
 
-                let iosDevice = <iOSDevice.IOSDevice>device;
-                let projectId = this.$projectData.projectId;
-                let npc = new iOSProxyServices.NotificationProxyClient(iosDevice, this.$injector);
+    public debugStart(): IFuture<void> {
+        return (() => {
+            this.$devicesServices.initialize({ platform: this.platform, deviceId: this.$options.device }).wait();
+            this.$devicesServices.execute((device: iOSDevice.IOSDevice) => this.debugBrkCore(device)).wait();
+        }).future<void>()();
+    }
 
-                try {
-                    let timeout = this.$utils.getMilliSecondsTimeout(IOSDebugService.TIMEOUT_SECONDS);
-                    awaitNotification(npc, notification.appLaunching(projectId), timeout).wait();
-                    process.nextTick(() => {
-                        npc.postNotificationAndAttachForData(notification.waitForDebug(projectId));
-                        npc.postNotificationAndAttachForData(notification.attachRequest(projectId));
-                    });
-
-                    awaitNotification(npc, notification.readyForAttach(projectId), this.getReadyForAttachTimeout(timeout)).wait();
-                } catch(e) {
-                    this.$logger.trace(`Timeout error: ${e}`);
-                    this.$errors.failWithoutHelp("Timeout waiting for NativeScript debugger.");
-                }
+    private debugBrkCore(iosDevice: iOSDevice.IOSDevice): IFuture<void> {
+        return (() => {
+            let projectId = this.$projectData.projectId;
+            let npc = new iOSProxyServices.NotificationProxyClient(iosDevice, this.$injector);
+
+            try {
+                let timeout = this.$utils.getMilliSecondsTimeout(IOSDebugService.TIMEOUT_SECONDS);
+                awaitNotification(npc, notification.appLaunching(projectId), timeout).wait();
+                process.nextTick(() => {
+                    npc.postNotificationAndAttachForData(notification.waitForDebug(projectId));
+                    npc.postNotificationAndAttachForData(notification.attachRequest(projectId));
+                });
+
+                awaitNotification(npc, notification.readyForAttach(projectId), this.getReadyForAttachTimeout(timeout)).wait();
+            } catch(e) {
+                this.$logger.trace(`Timeout error: ${e}`);
+                this.$errors.failWithoutHelp("Timeout waiting for NativeScript debugger.");
+            }
 
-                this.wireDebuggerClient(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
-                deploy.wait();
-            }).future<void>()()).wait();
+            this.wireDebuggerClient(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
         }).future<void>()();
     }