test: run all debugger tests in a single variables.test.ts invocation

Variables tests require to know which debugger to use, but running tests
with single debugger is slow and uncomfortable.

Now, variables.test.ts will run each tests for each of debugger in
single run. That is run.sh invoked only once, thus increasing test
speed.

There is still an unpleasant situation - Extension Test Runner vscode
extension shows variables tests as skipped while they are not and I do
not know how to fix it. Anyway tests are run, but it will be more
convenient to see each test in a separate tree item with it's status.

Author: ashenBlade

.vscode-test.mjs

@@ -4,7 +4,7 @@ import { defineConfig } from '@vscode/test-cli';
 // npx vscode-test --config .vscode-test.mjs
 export default defineConfig([
     {
-        label: 'Unit tests',
+        label: 'Tests',
         files: 'out/test/**/*.test.js',
         mocha: {
             ui: 'tdd',
@@ -14,7 +14,6 @@ export default defineConfig([
         version: 'stable',
         workspaceFolder: './pgsrc/18',
         env: {
-            PGHH_DEBUGGER: 'cppdbg',
             PGHH_PG_VERSION: '18',
             PGHH_VSCODE_VERSION: 'stable',
             PGHH_TEST_MODE: 'vars,format,unit',

.vscode/tasks.json

@@ -15,6 +15,19 @@
 				"kind": "build",
 				"isDefault": true
 			}
-		}
+		},
+        {
+            "type": "npm",
+            "script": "test",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "options": {
+                "env": {
+                    "PGHH_TEST_MODES": "vars,format,unit"
+                }
+            }
+        }
 	]
 }

src/test/README.md

@@ -53,8 +53,7 @@ There are useful flags that allows to specify which value range to use:
 
 ```bash
 ./src/test/test.sh --pg-versions="18 17 16" \
-                   --vscode-versions="stable 1.90" \
-                   --debuggers="lldb"
+                   --vscode-versions="stable 1.90"
 ```
 
 Use `--help` flag to get more info about.

src/test/runTests.ts

@@ -5,15 +5,6 @@ import { downloadAndUnzipVSCode,
          resolveCliArgsFromVSCodeExecutablePath,
          runTests } from '@vscode/test-electron';
 import { getTestEnv } from './suite/env';
-import { unnullify } from '../error';
-
-function getDebuggerExtensionId(debuggerType: string) {
-    if (debuggerType === 'cppdbg') {
-        return 'ms-vscode.cpptools';
-    } else {
-        return 'vadimcn.vscode-lldb';
-    }
-}
 
 async function main() {
     /*
@@ -37,11 +28,13 @@ async function main() {
     /* Install required debugger extension */
     let extraArgs: string[] = [];
     if (testEnv.testDebugger()) {
-        const dbgExtId = getDebuggerExtensionId(unnullify(testEnv.debugger, 'testEnv.debugger'));
-        cp.spawnSync(cliPath, [...args, '--install-extension', dbgExtId],
-                     { encoding: 'utf-8', stdio: 'inherit'});
-        /* Disable warnings if any */
-        extraArgs = ['--enable-proposed-api', dbgExtId];
+        extraArgs = [];
+        for (const dbgExt of ['ms-vscode.cpptools', 'vadimcn.vscode-lldb']) {
+            cp.spawnSync(cliPath, [...args, '--install-extension', dbgExt],
+                         { encoding: 'utf-8', stdio: 'inherit'});   
+            /* Disable warnings if any */
+            extraArgs.push('--enable-proposed-api', dbgExt);
+        }
     }
 
     /*

src/test/suite/env.ts

@@ -1,3 +1,4 @@
+import * as fs from 'fs';
 import * as path from 'path';
 
 export enum DebuggerType {
@@ -23,24 +24,17 @@ export class TestEnv {
     pgVersion: string;
     /* Version of VS Code we are running on */
     vscodeVersion: string;
-    /* Debugger extension is used */
-    debugger: DebuggerType | undefined;
+    /* Which tests are enabled */
     testMode: TestMode;
 
     constructor(pgVersion: string,
                 vscodeVersion: string,
-                debuggerType: string | undefined,
                 testMode: string) {
         if (Number.isNaN(Number(pgVersion))) {
             throw new Error(`Invalid PostgreSQL version "${pgVersion}".` +
                             'Version must be in "major.minor" form.');
         }
 
-        if (   debuggerType !== undefined
-            && !(debuggerType === DebuggerType.CppDbg || debuggerType === DebuggerType.CodeLLDB)) {
-            throw new Error(`Debugger ${debuggerType} is not supported`);
-        }
-        
         let mode: TestMode = TestMode.None;
         if (testMode.indexOf('vars') !== -1) {
             mode |= TestMode.Debug;
@@ -55,26 +49,12 @@ export class TestEnv {
         if (mode === TestMode.None) {
             throw new Error(`No test modes specified: accept between "vars" and "format"`);
         }
-        
-        if (mode & TestMode.Debug && !debuggerType) {
-            throw new Error('Test mode is "vars", but debugger is not specified');
-        }
 
         this.pgVersion = pgVersion;
         this.vscodeVersion = vscodeVersion;
-        this.debugger = debuggerType;
         this.testMode = mode;
     }
 
-    /* Which debugger is used to test variables */
-    debuggerIsCodeLLDB() {
-        return this.debugger === 'lldb';
-    }
-
-    debuggerIsCppDbg() {
-        return this.debugger === 'cppdbg';
-    }
-    
     /* Determine which tests to run */
     testDebugger() {
         return this.testMode & TestMode.Debug;
@@ -115,8 +95,5 @@ export function getTestEnv(): TestEnv {
     const pgVersion = process.env.PGHH_PG_VERSION ?? defaultPostgresVersion;
     const vscodeVersion = process.env.PGHH_VSCODE_VERSION ?? defaultVsCodeVersion;
     const testMode = process.env.PGHH_TEST_MODE ?? defaultTestMode;
-
-    /* Flag for variables tests */
-    const dbg = process.env.PGHH_DEBUGGER;
-    return new TestEnv(pgVersion, vscodeVersion, dbg, testMode);
+    return new TestEnv(pgVersion, vscodeVersion, testMode);
 }

src/test/suite/formatting.test.ts

@@ -54,7 +54,7 @@ suite('Formatting', async function () {
         });
 
         env = getTestEnv();
-        unformattedFilePath = env.getWorkspaceFile('unformatted.c');        
+        unformattedFilePath = env.getWorkspaceFile('unformatted.c');
         expected = getFormattedFile(env);
     });