add zip tests

joaomoreno · joaomoreno · commit a11c9b24770c · 2016-07-06T16:19:51.000+02:00
diff --git a/src/vs/base/node/zip.ts b/src/vs/base/node/zip.ts
@@ -69,7 +69,7 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): Pr
 	});
 }
 
-export function extract(zipPath: string, targetPath: string, options: IExtractOptions): Promise {
+export function extract(zipPath: string, targetPath: string, options: IExtractOptions = {}): Promise {
 	const sourcePathRegex = new RegExp(options.sourcePath ? `^${ options.sourcePath }` : '');
 
 	let promise = nfcall<ZipFile>(openZip, zipPath);
diff --git a/src/vs/base/test/node/zip/fixtures/extract.zip b/src/vs/base/test/node/zip/fixtures/extract.zip
diff --git a/src/vs/base/test/node/zip/zip.test.ts b/src/vs/base/test/node/zip/zip.test.ts
@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as path from 'path';
+import * as os from 'os';
+import URI from 'vs/base/common/uri';
+import { extract } from 'vs/base/node/zip';
+import { generateUuid } from 'vs/base/common/uuid';
+import { rimraf, exists } from 'vs/base/node/pfs';
+
+const fixtures = URI.parse(require.toUrl('./fixtures')).fsPath;
+
+suite('Zip', () => {
+
+	test('extract should handle directories', () => {
+		const fixture = path.join(fixtures, 'extract.zip');
+		const target = path.join(os.tmpdir(), generateUuid());
+
+		return extract(fixture, target)
+			.then(() => exists(path.join(target, 'extension', '1', '2', 'README.md')))
+			.then(exists => assert(exists))
+			.then(() => rimraf(target));
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): Pr`
`69`	`69`	`});`
`70`	`70`	`}`
`71`	`71`
`72`		`-export function extract(zipPath: string, targetPath: string, options: IExtractOptions): Promise {`
	`72`	`+export function extract(zipPath: string, targetPath: string, options: IExtractOptions = {}): Promise {`
`73`	`73`	const sourcePathRegex = new RegExp(options.sourcePath ? `^${ options.sourcePath }` : '');
`74`	`74`
`75`	`75`	`let promise = nfcall<ZipFile>(openZip, zipPath);`