test: split tests into integration and unit

gnikit · gnikit · commit d0a7a2a2e50f · 2022-09-23T19:46:41.000+01:00
diff --git a/package.json b/package.json
@@ -648,11 +648,14 @@
     "watch-dev": "webpack --mode development --watch --progress",
     "webpack": "webpack --mode production",
     "pretest": "npm run compile-dev && tsc -p tsconfig.test.json",
-    "test": "node ./out/test/runTest.js; npm run format",
+    "test": "npm run test:unit && npm run test:integration",
+    "test:unit": "node ./out/test/unitTest/runTest.js",
+    "test:integration": "node ./out/test/integration/runTest.js",
     "test:grammar-free": "vscode-tmgrammar-snap -s source.fortran.free -g ./syntaxes/fortran_free-form.tmLanguage.json \"./test/fortran/syntax/**/*{.f90,F90}\"",
     "test:grammar-fixed": "vscode-tmgrammar-snap -s source.fortran.fixed -g ./syntaxes/fortran_fixed-form.tmLanguage.json \"./test/fortran/syntax/**/*{.f,F}\"",
     "test:grammar": "npm run test:grammar-free && npm run test:grammar-fixed",
     "test:grammar-update": "npm run test:grammar-free -- -u && npm run test:grammar-fixed -- -u",
+    "posttest": "npm run format",
     "lint": "eslint . --ext .ts,.tsx",
     "lint-fix": "npm run lint -- --fix",
     "format": "prettier --write 'src/**/*.{ts,json}' 'test/**/*.ts' 'syntaxes/**/*.json' 'snippets/**/*.json' './**/*.{md,json,yaml,yml}'",
diff --git a/test/extension.test.ts b/test/extension.test.ts
diff --git a/test/integration/index.ts b/test/integration/index.ts
diff --git a/test/integration/lsp-client.test.ts b/test/integration/lsp-client.test.ts
@@ -1,30 +1,27 @@
 import * as vscode from 'vscode';
 import * as path from 'path';
 import { strictEqual } from 'assert';
-import { FortlsClient } from '../src/lsp/client';
-import { delay } from '../src/lib/helper';
-import { Logger, LogLevel } from '../src/services/logging';
+import { FortlsClient } from '../../src/lsp/client';
+import { delay } from '../../src/lib/helper';
+import { Logger, LogLevel } from '../../src/services/logging';
 
 const logger = new Logger(
   vscode.window.createOutputChannel('Modern Fortran', 'log'),
   LogLevel.DEBUG
 );
 
 suite('Language Server integration tests', () => {
-  let doc: vscode.TextDocument;
   const server = new FortlsClient(logger);
-  const fileUri = vscode.Uri.file(
-    path.resolve(__dirname, '../../test/fortran/function_subroutine_definitions.f90')
-  );
+  const fileUri = vscode.Uri.file(path.resolve(__dirname, '../../../test/fortran/sample.f90'));
 
-  suiteSetup(async function (): Promise<void> {
-    await server.activate();
+  suiteSetup(async () => {
+    const doc = await vscode.workspace.openTextDocument(fileUri);
+    await vscode.window.showTextDocument(doc);
   });
 
   test('Launch fortls & Check Initialization Response', async () => {
+    await server.activate();
     await delay(3000); // wait for server to initialize
-    doc = await vscode.workspace.openTextDocument(fileUri);
-    await vscode.window.showTextDocument(doc);
 
     const ref = {
       capabilities: {
diff --git a/test/integration/runTest.ts b/test/integration/runTest.ts
@@ -9,7 +9,7 @@ async function main() {
     const results = spawnSync(`pip`, [
       'install',
       '-r',
-      path.resolve(__dirname, '../../test/requirements.txt'),
+      path.resolve(__dirname, '../../../test/requirements.txt'),
       '--force',
       '--upgrade',
     ]);
@@ -20,8 +20,8 @@ async function main() {
     console.log(results.stdout.toString().trim());
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`
-    const extensionDevelopmentPath = path.resolve(__dirname, '../../');
-    const workspacePath = path.resolve(__dirname, '../../test/fortran/');
+    const extensionDevelopmentPath = path.resolve(__dirname, '../../../');
+    const workspacePath = path.resolve(__dirname, '../../../test/fortran/');
 
     // The path to the extension test runner script
     // Passed to --extensionTestsPath
diff --git a/test/unitTest/exit-code-err.ts b/test/unitTest/exit-code-err.ts
diff --git a/test/unitTest/exit-code.ts b/test/unitTest/exit-code.ts
diff --git a/test/unitTest/formatting-provider.test.ts b/test/unitTest/formatting-provider.test.ts
@@ -1,8 +1,8 @@
 import { strictEqual } from 'assert';
-import { FortranFormattingProvider } from '../src/features/formatting-provider';
+import { FortranFormattingProvider } from '../../src/features/formatting-provider';
 import * as vscode from 'vscode';
 import * as path from 'path';
-import { Logger, LogLevel } from '../src/services/logging';
+import { Logger, LogLevel } from '../../src/services/logging';
 
 const logger = new Logger(
   vscode.window.createOutputChannel('Modern Fortran', 'log'),
@@ -13,13 +13,12 @@ suite('Formatting tests', () => {
   let doc: vscode.TextDocument;
   const fmt = new FortranFormattingProvider(logger);
   const fileUri = vscode.Uri.file(
-    path.resolve(__dirname, '../../test/fortran/format/formatting_test.f90')
+    path.resolve(__dirname, '../../../test/fortran/format/formatting_test.f90')
   );
 
   suiteSetup(async function (): Promise<void> {
     doc = await vscode.workspace.openTextDocument(fileUri);
     await vscode.window.showTextDocument(doc);
-    console.log('Open file: ' + fileUri.toString());
   });
 
   test('Using findent', async () => {
@@ -66,7 +65,7 @@ end program main
       vscode.Uri.file(
         path.resolve(
           __dirname,
-          '../../test/fortran/format/formatting_test_fprettify_long_lines.f90'
+          '../../../test/fortran/format/formatting_test_fprettify_long_lines.f90'
         )
       )
     );
diff --git a/test/unitTest/functions.test.ts b/test/unitTest/functions.test.ts
@@ -5,7 +5,7 @@
 
 // The module 'assert' provides assertion methods from node
 import * as assert from 'assert';
-import { validVariableName, parseFunction, parseArgs } from '../src/lib/functions';
+import { validVariableName, parseFunction, parseArgs } from '../../src/lib/functions';
 
 suite('function helper test', () => {
   test('validVariableName does not allow variables starting with number', () => {
diff --git a/test/unitTest/helper.test.ts b/test/unitTest/helper.test.ts
@@ -10,7 +10,7 @@ import {
   isArrayOfString,
   arraysEqual,
   isPositionInString,
-} from '../src/lib/helper';
+} from '../../src/lib/helper';
 import * as vscode from 'vscode';
 
 suite('helper functions isTypeVariable tests', () => {
diff --git a/test/unitTest/index.ts b/test/unitTest/index.ts
@@ -0,0 +1,38 @@
+import path from 'path';
+import Mocha from 'mocha';
+import glob from 'glob';
+
+export function run(): Promise<void> {
+  // Create the mocha test
+  const mocha = new Mocha({
+    ui: 'tdd',
+    color: true,
+  });
+
+  const testsRoot = __dirname;
+
+  return new Promise((c, e) => {
+    glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
+      if (err) {
+        return e(err);
+      }
+
+      // Add files to the test suite
+      files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+
+      try {
+        // Run the mocha test
+        mocha.timeout(300000);
+        mocha.run(failures => {
+          if (failures > 0) {
+            e(new Error(`${failures} tests failed.`));
+          } else {
+            c();
+          }
+        });
+      } catch (err) {
+        e(err);
+      }
+    });
+  });
+}
diff --git a/test/unitTest/linter-provider.test.ts b/test/unitTest/linter-provider.test.ts
@@ -12,24 +12,24 @@ import {
 } from 'vscode';
 import * as fg from 'fast-glob';
 
-import { FortranLintingProvider } from '../src/features/linter-provider';
+import { FortranLintingProvider } from '../../src/features/linter-provider';
 import {
   GNULinter,
   GNUModernLinter,
   IntelLinter,
   NAGLinter,
   LFortranLinter,
-} from '../src/lib/linters';
-import { EXTENSION_ID, pipInstall } from '../src/lib/tools';
-import { Logger, LogLevel } from '../src/services/logging';
+} from '../../src/lib/linters';
+import { EXTENSION_ID, pipInstall } from '../../src/lib/tools';
+import { Logger, LogLevel } from '../../src/services/logging';
 
 const logger = new Logger(window.createOutputChannel('Modern Fortran', 'log'), LogLevel.DEBUG);
 
 suite('Linter integration', () => {
   let doc: TextDocument;
   const linter = new FortranLintingProvider(logger);
-  const fileUri = Uri.file(path.resolve(__dirname, '../../test/fortran/lint/test1.f90'));
-  const root = path.resolve(__dirname, '../../test/fortran/');
+  const fileUri = Uri.file(path.resolve(__dirname, '../../../test/fortran/lint/test1.f90'));
+  const root = path.resolve(__dirname, '../../../test/fortran/');
   const config = workspace.getConfiguration(EXTENSION_ID);
   const oldVals = config.get<string[]>('linter.includePaths');
 
@@ -113,7 +113,7 @@ suite('Linter integration', () => {
 // -----------------------------------------------------------------------------
 
 suite('fypp Linter integration', () => {
-  const root = path.resolve(__dirname, '../../test/fortran/');
+  const root = path.resolve(__dirname, '../../../test/fortran/');
   const config = workspace.getConfiguration(EXTENSION_ID);
 
   suiteSetup(async () => {
@@ -122,7 +122,7 @@ suite('fypp Linter integration', () => {
   });
 
   test('GNU - API call to doLint produces correct diagnostics', async () => {
-    const fileUri = Uri.file(path.resolve(__dirname, '../../test/fortran/fypp/demo.fypp'));
+    const fileUri = Uri.file(path.resolve(__dirname, '../../../test/fortran/fypp/demo.fypp'));
     const doc = await workspace.openTextDocument(fileUri);
     await window.showTextDocument(doc);
 
@@ -784,7 +784,7 @@ Sequence Error: lint/err-mod.f90, line 3: The IMPLICIT statement cannot occur he
     });
   });
   test('Diagnostics Array', async () => {
-    const fileUri = Uri.file(path.resolve(__dirname, '../../test/fortran/lint/err-mod.f90'));
+    const fileUri = Uri.file(path.resolve(__dirname, '../../../test/fortran/lint/err-mod.f90'));
     const doc = await workspace.openTextDocument(fileUri);
     await window.showTextDocument(doc);
     const diags = linter.parse(msg);
diff --git a/test/unitTest/logging.test.ts b/test/unitTest/logging.test.ts
@@ -1,5 +1,5 @@
 import { strictEqual } from 'assert';
-import { Logger, LogLevel, getConfigLogLevel } from '../src/services/logging';
+import { Logger, LogLevel, getConfigLogLevel } from '../../src/services/logging';
 
 suite('Logging', () => {
   const logger = new Logger();
diff --git a/test/unitTest/runTest.ts b/test/unitTest/runTest.ts
@@ -0,0 +1,44 @@
+import * as path from 'path';
+
+import { runTests } from '@vscode/test-electron';
+import { spawnSync } from 'child_process';
+
+async function main() {
+  try {
+    // Install PyPi dependencies
+    const results = spawnSync(`pip`, [
+      'install',
+      '-r',
+      path.resolve(__dirname, '../../../test/requirements.txt'),
+      '--force',
+      '--upgrade',
+    ]);
+    if (results.status !== 0) {
+      console.error(results.stderr.toString());
+      process.exit(1);
+    }
+    console.log(results.stdout.toString().trim());
+    // The folder containing the Extension Manifest package.json
+    // Passed to `--extensionDevelopmentPath`
+    const extensionDevelopmentPath = path.resolve(__dirname, '../../../');
+    const workspacePath = path.resolve(__dirname, '../../../test/fortran/');
+
+    // The path to the extension test runner script
+    // Passed to --extensionTestsPath
+    const extensionTestsPath = path.resolve(__dirname, './index');
+
+    const launchArgs = [workspacePath, '--disable-extensions'];
+    // Download VS Code, unzip it and run the integration test
+    await runTests({
+      launchArgs,
+      extensionDevelopmentPath,
+      extensionTestsPath,
+    });
+  } catch (err) {
+    console.error(err);
+    console.error('Failed to run tests');
+    process.exit(1);
+  }
+}
+
+main();
diff --git a/test/unitTest/tools.test.ts b/test/unitTest/tools.test.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as assert from 'assert';
 import { Uri } from 'vscode';
-import { shellTask, spawnAsPromise, pathRelToAbs } from '../src/lib/tools';
+import { shellTask, spawnAsPromise, pathRelToAbs } from '../../src/lib/tools';
 
 suite('Tools tests', () => {
   test('shellTask returns correct output', async () => {
@@ -59,8 +59,8 @@ suite('Tools tests', () => {
   });
 
   test('Resolve local paths: workspace selection', () => {
-    const root = Uri.parse(path.resolve(__dirname, '../../test/fortran'));
+    const root = Uri.parse(path.resolve(__dirname, '../../../test/fortran'));
     const absPath = pathRelToAbs('./sample.f90', root);
-    assert.strictEqual(absPath, path.resolve(__dirname, '../../test/fortran/sample.f90'));
+    assert.strictEqual(absPath, path.resolve(__dirname, '../../../test/fortran/sample.f90'));
   });
 });
