Clean up the tests

Author: akshita31

test/unitTests/Packages/PackageManager.test.ts

@@ -23,11 +23,9 @@ const ServerMock = require("mock-http-server");
 const getPort = require('get-port');
 
 suite("Package Manager", () => {
-    let tmpSourceDir: TmpAsset;
     let tmpInstallDir: TmpAsset;
     let server: any;
     let downloadUrl: string;
-    let testDirPath: string;
     let allFiles: Array<{ content: string, path: string }>;
     let installationPath: string;
     let eventBus: Array<BaseEvent>;
@@ -55,7 +53,6 @@ suite("Package Manager", () => {
 
     setup(async () => {
         eventBus = [];
-        tmpSourceDir = await CreateTmpDir(true);
         tmpInstallDir = await CreateTmpDir(true);
         installationPath = tmpInstallDir.name;
         packages = <Package[]>[
@@ -67,13 +64,12 @@ suite("Package Manager", () => {
                 architectures: [windowsPlatformInfo.architecture]
             }];
         allFiles = [...Files, ...Binaries];
-        testDirPath = tmpSourceDir.name + "/test.zip";
-        await createTestZipAsync(testDirPath, allFiles);
+        let buffer = await createTestZipAsync(allFiles);
         await new Promise(resolve => server.start(resolve)); //start the server
         server.on(getRequestHandler('GET', '/package', 200, {
             "content-type": "application/zip",
-            "content-length": (await fs.stat(testDirPath)).size
-        },  await fs.readFile(testDirPath)));
+            "content-length": buffer.length
+        },  buffer));
     });
 
     test("Downloads the package and installs at the specified path", async () => {
@@ -105,9 +101,6 @@ suite("Package Manager", () => {
     });
 
     teardown(async () => {
-        if (tmpSourceDir) {
-            tmpSourceDir.dispose();
-        }
         if (tmpInstallDir) {
             tmpInstallDir.dispose();
         }

test/unitTests/Packages/ZipInstaller.test.ts

@@ -13,15 +13,12 @@ import { EventStream } from '../../../src/EventStream';
 import { PlatformInformation } from '../../../src/platform';
 import { BaseEvent, InstallationStart } from '../../../src/omnisharp/loggingEvents';
 import { Files, Binaries, createTestZipAsync } from '../testAssets/CreateTestZip';
-import ReadFileIntoBuffer from '../testAssets/ReadFileIntoBuffer';
 
 chai.use(require("chai-as-promised"));
 let expect = chai.expect;
 
 suite('ZipInstaller', () => {
-    let tmpSourceDir: TmpAsset;
     let tmpInstallDir: TmpAsset;
-    let testDirPath: string;
     let installationPath: string;
     let testBuffer: Buffer;
 
@@ -33,13 +30,10 @@ suite('ZipInstaller', () => {
 
     setup(async () => {
         eventBus = [];
-        tmpSourceDir = await CreateTmpDir(true);
         tmpInstallDir = await CreateTmpDir(true);
         installationPath = tmpInstallDir.name;
         allFiles = [...Files, ...Binaries];
-        testDirPath = tmpSourceDir.name + "/test.zip";
-        await createTestZipAsync(testDirPath, allFiles);
-        testBuffer = await ReadFileIntoBuffer(testDirPath);
+        testBuffer = await createTestZipAsync(allFiles);
         util.setExtensionPath(tmpInstallDir.name);
     });
 
@@ -76,7 +70,8 @@ suite('ZipInstaller', () => {
     });
 
     teardown(async () => {
-        tmpSourceDir.dispose();
-        tmpInstallDir.dispose();
+        if (tmpInstallDir) {
+            tmpInstallDir.dispose();
+        }
     });
 });

test/unitTests/testAssets/CreateTestZip.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as archiver from 'archiver';
-import * as fs from 'async-file';
 
 export const Files = [
     {
@@ -26,14 +25,9 @@ export const Binaries = [
 ];
 
 
-export async function createTestZipAsync(dirPath: string, filesToAdd: Array<{ content: string, path: string }>): Promise<{}> {
-    let output = fs.createWriteStream(dirPath);
-
-    return new Promise((resolve, reject) => {
-        output.on('close', function () {
-            resolve(); // the installer needs to wait for the filestream to be closed here
-        });
-
+export async function createTestZipAsync(filesToAdd: Array<{ content: string, path: string }>): Promise<Buffer> {
+    let buffers: any[] = [];
+    return new Promise<Buffer>((resolve, reject) => {
         let archive = archiver('zip');
         archive.on('warning', function (err: any) {
             if (err.code === 'ENOENT') {
@@ -43,9 +37,9 @@ export async function createTestZipAsync(dirPath: string, filesToAdd: Array<{ co
                 reject(err);
             }
         });
-
+        archive.on('data', data => buffers.push(data));
         archive.on('error', reject);
-        archive.pipe(output);
+        archive.on('end', () => resolve(Buffer.concat(buffers)));
         filesToAdd.forEach(elem => archive.append(elem.content, { name: elem.path }));
         archive.finalize();
     });