Restore ability to debug and run extension tests

Author: nberth

.vscode-test.js

@@ -0,0 +1,11 @@
+const { defineConfig } = require('@vscode/test-cli');
+
+module.exports = defineConfig([
+  {
+    files: 'out/test/**/*.test.js',
+    mocha: {
+      ui: 'tdd',
+      timeout: 20000
+    }
+  }
+]);

.vscode/launch.json

@@ -7,13 +7,12 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}",
+				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--trace-deprecation"
 			],
-			"stopOnEntry": false,
 			"sourceMaps": true,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/test/**/*.js"
 			],
 			"preLaunchTask": "npm",
 			"internalConsoleOptions": "openOnSessionStart"
@@ -28,11 +27,12 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
 			],
+			"sourceMaps": true,
 			"outFiles": [
-				"${workspaceRoot}/out/**/*.js"
+				"${workspaceFolder}/out/test/**/*.js"
 			],
 			"preLaunchTask": "npm",
 			"internalConsoleOptions": "openOnSessionStart"
 		}
 	]
-}
+}

package.json

@@ -12,14 +12,14 @@
 	"version": "3.32.0",
 	"publisher": "OCamlPro SAS",
 	"contributors": [
-	{
-		"name": "Emilien Lemaire",
-		"email": "[email protected]"
-	},
-	{
-		"name": "Olegs Kunicins",
-		"email": "[email protected]"
-	}
+		{
+			"name": "Emilien Lemaire",
+			"email": "[email protected]"
+		},
+		{
+			"name": "Olegs Kunicins",
+			"email": "[email protected]"
+		}
 	],
 	"license": "GPL-3.0",
 	"icon": "icon.png",
@@ -52,7 +52,10 @@
 		"debuggers": [
 			{
 				"type": "superbol-gdb",
-				"languages": ["cobol", "COBOL"],
+				"languages": [
+					"cobol",
+					"COBOL"
+				],
 				"program": "./out/src/gdb.js",
 				"runtime": "node",
 				"label": "SuperBOL Debugger for GnuCOBOL",
@@ -257,26 +260,30 @@
 		"prepare": "tsc -p ./",
 		"compile": "tsc -p ./",
 		"watch": "tsc -w -p ./",
-		"test": "mocha -u tdd ./out/test/",
+		"test": "npm run compile && npm exec vscode-test",
 		"lint": "eslint -c .eslintrc.js --ext .ts ./"
 	},
 	"devDependencies": {
-		"@types/mocha": "^10.0.1",
+		"@types/expect": "^1.20.4",
+		"@types/mocha": "^10.0.10",
 		"@types/node": "^20.6.3",
-		"@types/vscode": "^1.44.0",
+		"@types/vscode": "^1.64.0",
 		"@typescript-eslint/eslint-plugin": "^6.7.2",
 		"@typescript-eslint/parser": "^6.7.2",
-		"@vscode/test-electron": "^2.3.4",
+		"@vscode/debugadapter-testsupport": "^1.51.0",
+		"@vscode/test-cli": "^0.0.12",
+		"@vscode/test-electron": "^2.5.2",
 		"eslint": "^8.50.0",
 		"eslint_d": "^12.2.1",
-		"mocha": "^10.2.0",
-		"typescript": "^5.2.2",
-		"@vscode/debugadapter-testsupport": "^1.51.0"
+		"mocha": "^10.8.2",
+		"ts-mocha": "^11.1.0",
+		"ts-node": "^10.9.2",
+		"tsconfig-paths": "^4.2.0",
+		"typescript": "^5.2.2"
 	},
 	"dependencies": {
-		"n-readlines": "^1.0.1",
-		"package_name": "^1.0.0",
+		"@vscode/debugadapter": "^1.51.0",
 		"@vscode/debugprotocol": "^1.51.0",
-		"@vscode/debugadapter": "^1.51.0"
+		"n-readlines": "^1.0.1"
 	}
 }

src/parser.c.ts

@@ -78,7 +78,7 @@ export class SourceMap {
     private performLine: number = -1; // 002 - stepOver in routines with "perform"
     private isVersion2_2_or_3_1_1: boolean = false;
 
-    constructor(cwd: string, filesCobol: string[], sourceDirs: string[], private log: Function) {
+    constructor(cwd: string, filesCobol: string[], sourceDirs: string[], private log: Function = (_ => {})) {
         this.cwd = fs.realpathSync(nativePathFromPath.resolve(cwd));
         this.log(`Source dirs: ${sourceDirs}`);
         for (const cSourceDir of sourceDirs) {

test/suite/functions.test.ts

@@ -6,8 +6,8 @@ import { parseExpression, cleanRawValue } from '../../src/functions';
 suite("Useful functions", () => {
     const cwd = nativePath.resolve(__dirname, '../../../test/resources');
     const c = nativePath.resolve(cwd, 'petstore.c');
-    const parsed = new SourceMap(cwd, [c]);
-    console.log(parsed.toString());
+    const parsed = new SourceMap(cwd, [c], [cwd]);
+    //console.log(parsed.toString());
     const functionName = "petstore_";
 
     test("it can parse expressions", () => {

test/suite/index.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import Mocha from 'mocha';
+import glob from 'glob';
 
 export function run(): Promise<void> {
 	// Create the mocha test

test/suite/parser.c.test.ts

@@ -6,8 +6,8 @@ suite("C code parse", () => {
 	const cwd = nativePath.resolve(__dirname, '../../../test/resources');
 	test("Minimal", () => {
 		const c = nativePath.resolve(cwd, 'hello.c');
-		const cobol = '/home/olegs/projects/gnucobol-debug/test/resources/hello.cbl';
-		const parsed = new SourceMap(cwd, [c]);
+		const cobol = nativePath.resolve(cwd, 'hello.cbl');
+		const parsed = new SourceMap(cwd, [c], [cwd]);
 
 		assert.equal(3, parsed.getLinesCount());
 		assert.equal(3, parsed.getVariablesCount());
@@ -24,8 +24,8 @@ suite("C code parse", () => {
 	});
 	test("GnuCOBOL 3.1.1", () => {
 		const c = nativePath.resolve(cwd, 'hello3.c');
-		const cobol = '/home/olegs/projects/gnucobol-debug/test/resources/hello3.cbl';
-		const parsed = new SourceMap(cwd, [c]);
+		const cobol = nativePath.resolve(cwd, 'hello3.cbl');
+		const parsed = new SourceMap(cwd, [c], [cwd]);
 
 		assert.equal(3, parsed.getLinesCount());
 		assert.equal(3, parsed.getVariablesCount());
@@ -47,7 +47,7 @@ suite("C code parse", () => {
 		const cSample = nativePath.resolve(cwd, 'sample.c');
 		const cSubSample = nativePath.resolve(cwd, 'subsample.c');
 		const cSubSubSample = nativePath.resolve(cwd, 'subsubsample.c');
-		const parsed = new SourceMap(cwd, [cSample, cSubSample, cSubSubSample]);
+		const parsed = new SourceMap(cwd, [cSample, cSubSample, cSubSubSample], [cwd]);
 
 		assert.equal(7, parsed.getLinesCount());
 		assert.equal(14, parsed.getVariablesCount());
@@ -65,7 +65,7 @@ suite("C code parse", () => {
 	});
 	test("Variables Hierarchy", () => {
 		const c = nativePath.resolve(cwd, 'petstore.c');
-		const parsed = new SourceMap(cwd, [c]);
+		const parsed = new SourceMap(cwd, [c], [cwd]);
 
 		assert.equal('b_14', parsed.getVariableByCobol('petstore_.WS-BILL').cName);
 		assert.equal('f_15', parsed.getVariableByCobol('petstore_.WS-BILL.TOTAL-QUANTITY').cName);
@@ -74,7 +74,7 @@ suite("C code parse", () => {
 	});
 	test("Find variables by function and COBOL name", () => {
 		const c = nativePath.resolve(cwd, 'petstore.c');
-		const parsed = new SourceMap(cwd, [c]);
+		const parsed = new SourceMap(cwd, [c], [cwd]);
 
 		assert.equal('f_15', parsed.findVariableByCobol('petstore_', 'TOTAL-QUANTITY').cName);
 		assert.equal('f_15', parsed.findVariableByCobol('petstore_', 'WS-BILL.TOTAL-QUANTITY').cName);
@@ -85,7 +85,7 @@ suite("C code parse", () => {
 	});
 	test("Attributes", () => {
 		const c = nativePath.resolve(cwd, 'datatypes.c');
-		const parsed = new SourceMap(cwd, [c]);
+		const parsed = new SourceMap(cwd, [c], [cwd]);
 
 		for (let variable of parsed.getVariablesByCobol()) {
 			assert.notEqual(variable.attribute, null);
@@ -108,7 +108,7 @@ suite("C code parse", () => {
 	});
 	test("Multiple Functions", () => {
 		const c = nativePath.resolve(cwd, 'func.c');
-		const parsed = new SourceMap(cwd, [c]);
+		const parsed = new SourceMap(cwd, [c], [cwd]);
 
 		const f_6 = parsed.getVariableByC('func_.f_6');
 		assert.equal('argA', f_6.cobolName);

tsconfig.json

@@ -7,7 +7,7 @@
 		"rootDir": ".",
 		"esModuleInterop": true,
 	},
-	"include": ["src"],
+	"include": ["src", "test"],
 	"exclude": [
 		"node_modules",
 		".vscode-test"