diff --git a/.vscode/launch.json b/.vscode/launch.json index f700a891..cb6ce3ea 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,10 +7,14 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["--extensionDevelopmentPath=${workspaceRoot}" ], + "args": [ + "--extensionDevelopmentPath=${workspaceFolder}" + ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": [ "${workspaceRoot}/out/src/**/*.js" ], + "outFiles": [ + "${workspaceFolder}/out/src/**/*.js" + ], "preLaunchTask": "npm" }, { @@ -18,11 +22,20 @@ "type": "extensionHost", "request": "launch", "runtimeExecutable": "${execPath}", - "args": ["test/resources/sample.f90","--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ], + "env": { + "CODE_TESTS_WORKSPACE": "./" + }, + "args": [ + "test/resources/sample.f90", + "--disable-extensions", + "--extensionDevelopmentPath=${workspaceFolder}", + "--extensionTestsPath=${workspaceFolder}/out/test" + ], "stopOnEntry": false, "sourceMaps": true, - "outFiles": [ "${workspaceRoot}/out/test/**/*.js" ], - "preLaunchTask": "npm" + "outFiles": [ + "${workspaceFolder}/out/test/**/*.js" + ] } ] -} +} \ No newline at end of file diff --git a/test/extension.test.ts b/test/extension.test.ts index a034bc80..8f48b155 100644 --- a/test/extension.test.ts +++ b/test/extension.test.ts @@ -5,19 +5,18 @@ // The module 'assert' provides assertion methods from node import * as assert from "assert"; -import * as fs from "fs"; // You can import and use all API from the 'vscode' module // as well as import your extension to test it import * as vscode from "vscode"; -import * as myExtension from "../src/extension"; +import * as path from 'path'; import { FortranDocumentSymbolProvider } from "../src/features/document-symbol-provider"; // Defines a Mocha test suite to group tests of similar kind together suite("Extension Tests", () => { test("symbol provider works as expected", async () => { - const filePath = "/test/resources/sample.f90"; - const openPath = vscode.Uri.file(`${vscode.workspace.rootPath}${filePath}`); + const filePath = path.resolve(__dirname, "../../test/resources/sample.f90"); + const openPath = vscode.Uri.file(filePath); const doc = await vscode.workspace.openTextDocument(openPath); vscode.window.showTextDocument(doc); const symbolProvider = new FortranDocumentSymbolProvider();