Remove obsolete gnattest integration code and tests

Author: eliericha

integration/vscode/ada/src/gnattest.ts

@@ -133,90 +133,6 @@ async function refreshTestItemTree() {
     await addTestsRootLevel();
 }
 
-/*
-    Resolves Tests to run for a selected test item in the Explorer
-*/
-export function gatherChildTestItems(
-    collection: vscode.TestItemCollection | readonly vscode.TestItem[]
-): vscode.TestItem[] {
-    let items: vscode.TestItem[] = [];
-    collection.forEach((item) => {
-        if (item.children.size == 0) {
-            items.push(item);
-        } else {
-            items = items.concat(gatherChildTestItems(item.children));
-        }
-    });
-    return items;
-}
-
-/*
-    Gets the Source file name for a test item
-    Needed for the --routines switch
-*/
-export function getParentTestSourceName(item: vscode.TestItem) {
-    let parent: vscode.TestItem = item;
-    if (item.parent != undefined) {
-        parent = getParentTestSourceName(item.parent);
-    }
-    return parent;
-}
-
-/*
-    Return the test_runner output stored in the result.txt file
-*/
-export async function readResultFile(resultPath: string) {
-    if (vscode.workspace.workspaceFolders !== undefined) {
-        if (pathIsReadable(resultPath)) {
-            const file = await vscode.workspace.fs.readFile(vscode.Uri.file(resultPath));
-            return file.toString();
-        }
-    }
-    return undefined;
-}
-
-enum Test_State {
-    PASSED = 'PASSED',
-    FAILED = 'FAILED',
-}
-
-/*
-    Parses the result of the file 'result.txt'
-*/
-export function parseResults(
-    tests: vscode.TestItem[],
-    run: vscode.TestRun | undefined,
-    file: string
-): boolean {
-    const matchs = file.match(
-        /(^|\n)((\w|-)+).ad[b|s]:\d+:\d+: (info|error): corresponding test (\w+)/g
-    );
-    if (matchs) {
-        for (let i = 0; i < matchs.length; i++) {
-            matchs[i] = matchs[i].replace(/\n/, '');
-            for (const e of tests) {
-                // Check if the result line is for the test 'e'
-                const test_src = getParentTestSourceName(e);
-                const p: number | undefined = e.parent?.range?.start.line;
-                const test_line: number = p ? p + 1 : 0;
-                const check_line = matchs[i].match(test_src.label + ':' + test_line.toString());
-                // update the state of the test
-                if (check_line != null && run != undefined) {
-                    run.appendOutput(`Completed ${e.id}\r\n`);
-                    const mm: string = matchs[i].substring(matchs[i].length - 6, matchs[i].length);
-                    if (mm == Test_State.PASSED) {
-                        run.passed(e);
-                    } else {
-                        run.failed(e, new vscode.TestMessage(matchs[i]));
-                    }
-                }
-            }
-        }
-        return true;
-    }
-    return false;
-}
-
 async function getGnatTestXmlPath(): Promise<string> {
     const objDir = await getObjectDir();
     const gnatTestXmlPath = path.join(objDir, 'gnattest', 'harness', 'gnattest.xml');

integration/vscode/ada/test/suite/gnattest/gnattest.test.ts

@@ -1,93 +1,8 @@
-import * as assert from 'assert';
-import * as cp from 'child_process';
-import { suite, test } from 'mocha';
-import * as path from 'path';
-import * as vscode from 'vscode';
-import { adaExtState } from '../../../src/extension';
-import * as gnattest from '../../../src/gnattest';
-import { getProjectFile } from '../../../src/helpers';
-import { activate, assertEqualToFileContent } from '../utils';
+import { suite } from 'mocha';
+import { activate } from '../utils';
 
 suite('GNATtest Integration Tests', function () {
     this.beforeAll(async () => {
         await activate();
     });
-    test('Generate Tests', async () => {
-        const projectFile = await getProjectFile(adaExtState.adaClient);
-        // Generate tests and redirect the stderr to stdout if command failed
-        cp.execSync('gnattest -P ' + projectFile + ' 2>&1', { timeout: 60000 });
-    });
-    test('Build & Run the tests', () => {
-        if (vscode.workspace.workspaceFolders) {
-            const ext: string = process.platform == 'win32' ? '.exe' : '';
-            const cwd = vscode.workspace.workspaceFolders[0].uri.fsPath;
-
-            cp.execSync(
-                'gprbuild -P ' + path.join(cwd, 'obj', 'gnattest', 'harness', 'test_driver.gpr'),
-                { timeout: 60000 }
-            );
-            cp.execSync(
-                path.join(cwd, 'obj', 'gnattest', 'harness', 'test_runner' + ext) +
-                    ' > ' +
-                    path.join(cwd, 'obj', 'gnattest', 'result.txt'),
-                { timeout: 60000 }
-            );
-        } else {
-            throw new Error('No workspace folder found for the specified URI');
-        }
-    });
-    test('Expected Tests discovered', async () => {
-        const root = await gnattest.addTestsRootLevel();
-        assert.notStrictEqual(root, undefined);
-        const tests = gnattest.gatherChildTestItems(gnattest.controller.items);
-        for (let i = 0; i < tests.length; i++) {
-            assert.strictEqual(tests[i].label, expectedTests[i].name);
-            assert.strictEqual(tests[i].range?.start.line, expectedTests[i].line);
-        }
-    });
-    test('Read & Parse & compare the results', async () => {
-        if (vscode.workspace.workspaceFolders) {
-            const cwd = vscode.workspace.workspaceFolders[0].uri.fsPath;
-            const resultPath = path.join(cwd, 'obj', 'gnattest', 'result.txt');
-            const result = await gnattest.readResultFile(resultPath);
-            assert.notStrictEqual(
-                result,
-                undefined,
-                'Could not read the result file ' + resultPath
-            );
-            if (result != undefined) {
-                const expectedUri = vscode.Uri.joinPath(
-                    vscode.workspace.workspaceFolders[0].uri,
-                    'result.txt.expected'
-                );
-                assert.strictEqual(gnattest.parseResults([], undefined, result), true);
-                assertEqualToFileContent(result, expectedUri);
-            }
-        } else {
-            throw new Error('No workspace folder found for the specified URI');
-        }
-    });
 });
-
-const expectedTests = [
-    {
-        name: 'Test_Speed_bdc804',
-        line: 39,
-    },
-    {
-        name: 'Test_Adjust_Speed_6fd48f',
-        line: 60,
-    },
-    {
-        name: 'Test_Desired_Speed_3a9813',
-        line: 39,
-    },
-    {
-        name: 'Test_Set_Desired_Speed_42cd33',
-        line: 60,
-    },
-    {
-        name: 'Test_Adjust_Speed_6fd48f',
-        line: 81,
-    },
-];