Modify the tests

Author: akshita31

src/packageManager/downloadAndInstallPackages.ts

@@ -29,7 +29,7 @@ export async function downloadAndInstallPackages(packages: AbsolutePathPackage[]
                     count++;
                     let buffer = await DownloadFile(pkg.description, eventStream, provider, pkg.url, pkg.fallbackUrl);
                     eventStream.post(new DownloadValidation(pkg.description));
-                    if (await isValidDownload(buffer, pkg.integrity)) {
+                    if (isValidDownload(buffer, pkg.integrity)) {
                         eventStream.post(new IntegrityCheckSuccess());
                         await InstallZip(buffer, pkg.description, pkg.installPath, pkg.binaries, eventStream);
                         installationStage = 'touchLockFile';

src/packageManager/isValidDownload.ts

@@ -3,38 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as stream from "stream";
 import * as crypto from "crypto";
 
-const hash = crypto.createHash('sha256');
-
-export async function isValidDownload(buffer: Buffer, integrity: string): Promise<boolean> {
+export function isValidDownload(buffer: Buffer, integrity: string): boolean {
+    let hash = crypto.createHash('sha256');
     if (integrity && integrity.length > 0) {
-        return new Promise<boolean>((resolve) => {
-            let value: string;
-            var bufferStream = new stream.PassThrough();
-            bufferStream.end(buffer);
-            bufferStream.on("readable", () => {
-                const data = bufferStream.read();
-                if (data) {
-                    hash.update(data);
-                }
-            });
-            bufferStream.on('end', () => {
-                value = hash.digest('hex');
-                if (value == integrity) {
-                    resolve(true);
-                }
-                else {
-                    resolve(false);
-                }
-            });
-
-            bufferStream.on("error", () => {
-                //if the bufferstream errored
-                resolve(false);
-            });
-        });
+        hash.update(buffer);
+        let value = hash.digest('hex');
+        if (value.toUpperCase() == integrity.toUpperCase()) {
+            return true;
+        }
+        else {
+            return false;
+        }
     }
 
     // no integrity has been specified

test/unitTests/OmnisharpDownloader.test.ts

@@ -14,7 +14,7 @@ import MockHttpsServer from "./testAssets/MockHttpsServer";
 import {expect} from 'chai';
 import TestZip from "./testAssets/TestZip";
 import { createTestFile } from "./testAssets/TestFile";
-import { PackageInstallation, LogPlatformInfo, DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, InstallationSuccess, PackageInstallStart } from "../../src/omnisharp/loggingEvents";
+import { PackageInstallation, LogPlatformInfo, DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, InstallationSuccess, PackageInstallStart, DownloadValidation, IntegrityCheckSuccess } from "../../src/omnisharp/loggingEvents";
 import TestEventBus from "./testAssets/TestEventBus";
 import { testPackageJSON } from "./testAssets/testAssets";
 
@@ -59,14 +59,16 @@ suite('OmnisharpDownloader', () => {
     });
 
     test('Events are created', async () => { 
-        let expectedSequence = [ 
-            new PackageInstallation('OmniSharp Version = 1.2.3'), 
-            new LogPlatformInfo(new PlatformInformation("win32", "x86")), 
+        let expectedSequence = [
+            new PackageInstallation('OmniSharp Version = 1.2.3'),
+            new LogPlatformInfo(new PlatformInformation("win32", "x86")),
             new PackageInstallStart(),
-            new DownloadStart('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'), 
-            new DownloadSizeObtained(testZip.size), 
-            new DownloadProgress(100, 'OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'), 
-            new DownloadSuccess(' Done!'), 
+            new DownloadStart('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'),
+            new DownloadSizeObtained(testZip.size),
+            new DownloadProgress(100, 'OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'),
+            new DownloadSuccess(' Done!'),
+            new DownloadValidation('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'),
+            new IntegrityCheckSuccess(),
             new InstallationStart('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'), 
             new InstallationSuccess() 
         ]; 

test/unitTests/Packages/ZipInstaller.test.ts

@@ -76,12 +76,12 @@ suite('ZipInstaller', () => {
     });
 
     test('Error is thrown when the buffer contains an invalid zip', async () => {
-        expect(InstallZip(new Buffer("My file", "utf8"), "Text File", installationPath, [], eventStream)).to.be.rejected;
+        expect(InstallZip(Buffer.from("My file", "utf8"), "Text File", installationPath, [], eventStream)).to.be.rejected;
     });
 
     test('Error event is created when the buffer contains an invalid zip', async () => {
         try {
-            await InstallZip(new Buffer("some content", "utf8"), "Text File", installationPath, [], eventStream);
+            await InstallZip(Buffer.from("some content", "utf8"), "Text File", installationPath, [], eventStream);
         }
         catch{
             let eventSequence: BaseEvent[] = [

test/unitTests/Packages/downloadAndInstallPackages.test.ts

@@ -12,7 +12,7 @@ import TestZip from '../testAssets/TestZip';
 import { downloadAndInstallPackages } from '../../../src/packageManager/downloadAndInstallPackages';
 import NetworkSettings from '../../../src/NetworkSettings';
 import { EventStream } from '../../../src/EventStream';
-import { DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, PackageInstallStart } from '../../../src/omnisharp/loggingEvents';
+import { DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, PackageInstallStart, DownloadValidation, IntegrityCheckSuccess } from '../../../src/omnisharp/loggingEvents';
 import MockHttpsServer from '../testAssets/MockHttpsServer';
 import { createTestFile } from '../testAssets/TestFile';
 import TestEventBus from '../testAssets/TestEventBus';
@@ -91,10 +91,13 @@ suite(`${downloadAndInstallPackages.name}`, () => {
                 new DownloadSizeObtained(testZip.size),
                 new DownloadProgress(100, packageDescription),
                 new DownloadSuccess(' Done!'),
+                new DownloadValidation(packageDescription),
+                new IntegrityCheckSuccess(),
                 new InstallationStart(packageDescription)
             ];
 
             await downloadAndInstallPackages(downloadablePackage, networkSettingsProvider, eventStream);
+            console.log(eventBus.getEvents());
             expect(eventBus.getEvents()).to.be.deep.equal(eventsSequence);
         });
     });

test/unitTests/Packages/isValidDownload.test.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { isValidDownload } from "../../../src/packageManager/isValidDownload";
+import { createTestFile } from "../testAssets/TestFile";
+import TestZip from "../testAssets/TestZip";
+import * as chai from "chai";
+
+chai.should();
+const expect = chai.expect;
+
+suite(`${isValidDownload.name}`, () => {
+    const files = [
+        createTestFile("file1", "file1.txt"),
+        createTestFile("file2", "file2.txt")
+    ];
+
+    let testZip: TestZip; 
+
+    setup(async() => {
+        testZip = await TestZip.createTestZipAsync(...files);
+    });
+    
+    test('Returns false for non-matching integrity', async () => {
+        let result = await isValidDownload(testZip.buffer, "inValidIntegrity");
+        expect(result).to.be.false;
+    });
+
+    test('Returns true for matching integrity', async () => {
+        let result = await isValidDownload(testZip.buffer, "212785b9cf15888785ed55a9357b4c4e29d0acca6a978ccb1df7cc8ee7423071");
+        expect(result).to.be.true;
+    });
+});

test/unitTests/logging/CsharpLoggerObserver.test.ts

@@ -175,5 +175,9 @@ suite("CsharpLoggerObserver", () => {
         expect(logOutput).to.contain(description);
     });
 
-    test(`${Event}`)
+    test(`${Event.IntegrityCheckSuccess.name}: Some message is logged`, () => {
+        let event = new Event.IntegrityCheckSuccess();
+        observer.post(event);
+        expect(logOutput).to.not.be.empty;
+    });
 });