Fix failing tests

Author: award999

test/unit-tests/commands/captureDiagnostics.test.ts renamed to test/integration-tests/commands/captureDiagnostics.test.ts

@@ -15,97 +15,69 @@
 import * as vscode from "vscode";
 import * as path from "path";
 import * as os from "os";
-import * as fs from "fs/promises";
+import { mkdir, rm } from "fs/promises";
 import * as decompress from "decompress";
 import { expect } from "chai";
-import { instance, MockedObject, mockFn, mockGlobalObject, mockObject } from "../../MockUtils";
 import { captureDiagnostics } from "../../../src/commands/captureDiagnostics";
 import { WorkspaceContext } from "../../../src/WorkspaceContext";
-import { FolderContext } from "../../../src/FolderContext";
-import { Version } from "../../../src/utilities/version";
-import { SwiftToolchain } from "../../../src/toolchain/toolchain";
-import { SwiftLogger } from "../../../src/logging/SwiftLogger";
+import { mockGlobalObject } from "../../MockUtils";
+import { activateExtensionForSuite, folderInRootWorkspace } from "../utilities/testutilities";
 
 suite("captureDiagnostics Test Suite", () => {
-    let mockContext: MockedObject<WorkspaceContext>;
-    let mockedLogger: MockedObject<SwiftLogger>;
-    let mockedToolchain: MockedObject<SwiftToolchain>;
+    let workspaceContext: WorkspaceContext;
     const mockWindow = mockGlobalObject(vscode, "window");
 
+    activateExtensionForSuite({
+        async setup(ctx) {
+            workspaceContext = ctx;
+        },
+        testAssets: ["defaultPackage"],
+    });
+
     setup(() => {
-        mockedToolchain = mockObject<SwiftToolchain>({
-            swiftVersion: new Version(6, 0, 0),
-            diagnostics: "some diagnostics",
-        });
-        const mockedFolder = mockObject<FolderContext>({
-            folder: vscode.Uri.file("/folder1"),
-            toolchain: instance(mockedToolchain),
-        });
-        mockedLogger = mockObject<SwiftLogger>({
-            info: mockFn(),
-            logs: ["hello", "world"],
-        });
-        mockContext = mockObject<WorkspaceContext>({
-            folders: [instance(mockedFolder)],
-            globalToolchainSwiftVersion: new Version(6, 0, 0),
-            logger: instance(mockedLogger),
-        });
         mockWindow.showInformationMessage.resolves("Minimal" as any);
     });
 
     test("Should capture dianostics to a zip file", async () => {
-        const zipPath = await captureDiagnostics(instance(mockContext));
+        const zipPath = await captureDiagnostics(workspaceContext);
         expect(zipPath).to.not.be.undefined;
     });
 
     test("Should validate a single folder project zip file has contents", async () => {
-        const zipPath = await captureDiagnostics(instance(mockContext));
+        const zipPath = await captureDiagnostics(workspaceContext);
         expect(zipPath).to.not.be.undefined;
 
         const { files, folder } = await decompressZip(zipPath as string);
 
         validate(
             files.map(file => file.path),
-            ["extension-logs.txt", "folder1-[a-z0-9]+-settings.txt"]
+            ["swift-vscode-extension.log", "defaultPackage-[a-z0-9]+-settings.txt"]
         );
 
-        await fs.rm(folder, { recursive: true, force: true });
+        await rm(folder, { recursive: true, force: true });
     });
 
     suite("Multiple folder project", () => {
-        setup(() => {
-            const mockedFolder1 = mockObject<FolderContext>({
-                folder: vscode.Uri.file("/folder1"),
-                toolchain: instance(mockedToolchain),
-            });
-            const mockedFolder2 = mockObject<FolderContext>({
-                folder: vscode.Uri.file("/folder2"),
-                toolchain: instance(mockedToolchain),
-            });
-            mockContext = mockObject<WorkspaceContext>({
-                folders: [instance(mockedFolder1), instance(mockedFolder2)],
-                globalToolchainSwiftVersion: new Version(6, 0, 0),
-                logger: instance(mockedLogger),
-            });
-            mockWindow.showInformationMessage.resolves("Minimal" as any);
+        setup(async () => {
+            await folderInRootWorkspace("dependencies", workspaceContext);
         });
 
         test("Should validate a multiple folder project zip file has contents", async () => {
-            const zipPath = await captureDiagnostics(instance(mockContext));
+            const zipPath = await captureDiagnostics(workspaceContext);
             expect(zipPath).to.not.be.undefined;
 
             const { files, folder } = await decompressZip(zipPath as string);
             validate(
                 files.map(file => file.path),
                 [
-                    "extension-logs.txt",
-                    "folder1/",
-                    "folder1/folder1-[a-z0-9]+-settings.txt",
-                    "folder2/",
-                    "folder2/folder2-[a-z0-9]+-settings.txt",
+                    "swift-vscode-extension.log",
+                    "defaultPackage/",
+                    "defaultPackage/defaultPackage-[a-z0-9]+-settings.txt",
+                    "dependencies/",
+                    "dependencies/dependencies-[a-z0-9]+-settings.txt",
                 ]
             );
-            await fs.rm(folder, { recursive: true, force: true });
+            await rm(folder, { recursive: true, force: true });
         });
     });
 
@@ -116,7 +88,7 @@ suite("captureDiagnostics Test Suite", () => {
             os.tmpdir(),
             `vscode-swift-test-${Math.random().toString(36).substring(7)}`
         );
-        await fs.mkdir(tempDir, { recursive: true });
+        await mkdir(tempDir, { recursive: true });
         return { folder: tempDir, files: await decompress(zipPath as string, tempDir) };
     }
 

test/unit-tests/sourcekit-lsp/LanguageClientManager.test.ts

@@ -50,6 +50,8 @@ import {
     DidChangeActiveDocumentParams,
 } from "../../../src/sourcekit-lsp/extensions/DidChangeActiveDocumentRequest";
 import { SwiftLogger } from "../../../src/logging/SwiftLogger";
+import { SwiftOutputChannel } from "../../../src/logging/SwiftOutputChannel";
+import { SwiftLoggerFactory } from "../../../src/logging/SwiftLoggerFactory";
 
 suite("LanguageClientManager Suite", () => {
     let languageClientFactoryMock: MockedObject<LanguageClientFactory>;
@@ -60,6 +62,7 @@ suite("LanguageClientManager Suite", () => {
     let mockedFolder: MockedObject<FolderContext>;
     let didChangeFoldersEmitter: AsyncEventEmitter<FolderEvent>;
     let mockLogger: MockedObject<SwiftLogger>;
+    let mockLoggerFactory: MockedObject<SwiftLoggerFactory>;
     let mockedToolchain: MockedObject<SwiftToolchain>;
     let mockedBuildFlags: MockedObject<BuildFlags>;
 
@@ -113,6 +116,9 @@ suite("LanguageClientManager Suite", () => {
             info: s => s,
             debug: s => s,
         });
+        mockLoggerFactory = mockObject<SwiftLoggerFactory>({
+            create: mockFn(s => s.returns(mockObject<SwiftOutputChannel>({}))),
+        });
         didChangeFoldersEmitter = new AsyncEventEmitter();
         mockedFolder = mockObject<FolderContext>({
             isRootFolder: false,
@@ -127,6 +133,7 @@ suite("LanguageClientManager Suite", () => {
                     globalToolchain: instance(mockedToolchain),
                     globalToolchainSwiftVersion: new Version(6, 0, 0),
                     logger: instance(mockLogger),
+                    loggerFactory: instance(mockLoggerFactory),
                 })
             ),
             swiftVersion: new Version(6, 0, 0),
@@ -136,6 +143,7 @@ suite("LanguageClientManager Suite", () => {
             globalToolchain: instance(mockedToolchain),
             globalToolchainSwiftVersion: new Version(6, 0, 0),
             logger: instance(mockLogger),
+            loggerFactory: instance(mockLoggerFactory),
             subscriptions: [],
             folders: [instance(mockedFolder)],
             onDidChangeFolders: mockFn(s => s.callsFake(didChangeFoldersEmitter.event)),
@@ -150,7 +158,7 @@ suite("LanguageClientManager Suite", () => {
             code2ProtocolConverter: instance(mockedConverter),
             clientOptions: {},
             outputChannel: instance(
-                mockObject<vscode.OutputChannel>({
+                mockObject<SwiftOutputChannel>({
                     dispose: mockFn(),
                 })
             ),