Merge pull request #563 from fortran-lang/feature/test-restructure

Restructured test Fortran code

Author: gnikit

.vscode/launch.json

@@ -18,7 +18,7 @@
       "request": "launch",
       "runtimeExecutable": "${execPath}",
       "args": [
-        "${workspaceFolder}/test/resources",
+        "${workspaceFolder}/test/fortran",
         "--disable-extension=fortran-lang.linter-gfortran",
         "--extensionDevelopmentPath=${workspaceFolder}",
         "--extensionTestsPath=${workspaceFolder}/out/test"

CHANGELOG.md

@@ -515,8 +515,8 @@
     "webpack": "webpack --mode production",
     "pretest": "npm run compile-dev && tsc -p tsconfig.test.json",
     "test": "node ./out/test/runTest.js",
-    "test:grammar-free": "vscode-tmgrammar-snap -s source.fortran.free -g ./syntaxes/fortran_free-form.tmLanguage.json \"./test/**/*{.f90,F90}\"",
-    "test:grammar-fixed": "vscode-tmgrammar-snap -s source.fortran.fixed -g ./syntaxes/fortran_fixed-form.tmLanguage.json \"./test/**/*{.f,F}\"",
+    "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",
     "lint": "eslint . --ext .ts,.tsx",

package.json

@@ -15,7 +15,7 @@ import { FortranDocumentSymbolProvider } from '../src/features/document-symbol-p
 // Defines a Mocha test suite to group tests of similar kind together
 suite('Extension Tests', () => {
   test('symbol provider works as expected', async () => {
-    const filePath = path.resolve(__dirname, '../../test/resources/sample.f90');
+    const filePath = path.resolve(__dirname, '../../test/fortran/sample.f90');
     const openPath = vscode.Uri.file(filePath);
     const doc = await vscode.workspace.openTextDocument(openPath);
     vscode.window.showTextDocument(doc);

test/extension.test.ts

@@ -9,7 +9,7 @@ suite('Formatting tests', () => {
   let doc: vscode.TextDocument;
   const fmt = new FortranFormattingProvider(new LoggingService());
   const fileUri = vscode.Uri.file(
-    path.resolve(__dirname, '../../test/resources/formatting_test.f90')
+    path.resolve(__dirname, '../../test/fortran/format/formatting_test.f90')
   );
 
   suiteSetup(async function (): Promise<void> {
@@ -62,7 +62,10 @@ end program main
   test(`Using fprettify with stderr`, async () => {
     doc = await vscode.workspace.openTextDocument(
       vscode.Uri.file(
-        path.resolve(__dirname, '../../test/resources/formatting_test_fprettify_long_lines.f90')
+        path.resolve(
+          __dirname,
+          '../../test/fortran/format/formatting_test_fprettify_long_lines.f90'
+        )
       )
     );
     const edits = await fmt['doFormatFprettify'](doc);