Merge pull request microsoft#30198 from Microsoft/tyriar/27771

Tyriar · web-flow · commit 1401c3056747 · 2017-07-06T10:27:42.000-07:00
Add tests for TerminalPanel.preparePathForTerminal
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -246,7 +246,7 @@ export class TerminalPanel extends Panel {
 				}
 
 				const terminal = this._terminalService.getActiveInstance();
-				terminal.sendText(this._preparePathForTerminal(uri), false);
+				terminal.sendText(TerminalPanel.preparePathForTerminal(uri), false);
 			}
 		}));
 	}
@@ -327,7 +327,7 @@ export class TerminalPanel extends Panel {
 	/**
 	 * Adds quotes to a path if it contains whitespaces
 	 */
-	private _preparePathForTerminal(path: string) {
+	public static preparePathForTerminal(path: string): string {
 		if (platform.isWindows) {
 			if (/\s+/.test(path)) {
 				return `"${path}"`;
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalPanel.test.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as assert from 'assert';
+import { TerminalPanel } from 'vs/workbench/parts/terminal/electron-browser/terminalPanel';
+import * as platform from 'vs/base/common/platform';
+
+suite('Workbench - TerminalPanel', () => {
+	test('preparePathForTerminal', function () {
+		if (platform.isWindows) {
+			assert.equal(TerminalPanel.preparePathForTerminal('C:\\foo'), 'C:\\foo');
+			assert.equal(TerminalPanel.preparePathForTerminal('C:\\foo bar'), '"C:\\foo bar"');
+			return;
+		}
+		assert.equal(TerminalPanel.preparePathForTerminal('/a/\\foo bar"\'? ;\'??  :'), '/a/\\\\foo\\ bar\\"\\\'\\?\\ \\;\\\'\\?\\?\\ \\ \\:');
+		assert.equal(TerminalPanel.preparePathForTerminal('/\\\'"?:;!*(){}[]'), '/\\\\\\\'\\"\\?\\:\\;\\!\\*\\(\\)\\{\\}\\[\\]');
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ export class TerminalPanel extends Panel {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`const terminal = this._terminalService.getActiveInstance();`
`249`		`- terminal.sendText(this._preparePathForTerminal(uri), false);`
	`249`	`+ terminal.sendText(TerminalPanel.preparePathForTerminal(uri), false);`
`250`	`250`	`}`
`251`	`251`	`}));`
`252`	`252`	`}`
`@@ -327,7 +327,7 @@ export class TerminalPanel extends Panel {`
`327`	`327`	`/**`
`328`	`328`	`* Adds quotes to a path if it contains whitespaces`
`329`	`329`	`*/`
`330`		`- private _preparePathForTerminal(path: string) {`
	`330`	`+ public static preparePathForTerminal(path: string): string {`
`331`	`331`	`if (platform.isWindows) {`
`332`	`332`	`if (/\s+/.test(path)) {`
`333`	`333`	return `"${path}"`;