Put tests side-by-side with main code (#394)

* Put tests side-by-side with main code

* Restore grammar tests

package.json

@@ -49,7 +49,7 @@
         "pretest": "npm run compile",
         "test": "npm run test_grammar_inner && npm run test_unit",
         "test_grammar": "npm run compile_grammar && npm run test_grammar_inner",
-        "test_grammar_inner": "vscode-tmgrammar-snap src/test/suite/grammar/samples/*.{ahk1,ahk2}",
+        "test_grammar_inner": "vscode-tmgrammar-snap language/samples/*.{ahk1,ahk2}",
         "test_unit": "node ./out/test/runTest.js",
         "tsc": "tsc --noEmit --skipLibCheck && echo No TSC problems",
         "validate": "npm run lint && npm run test",

src/test/suite/common/codeUtil.test.ts → src/common/codeUtil.test.ts

@@ -1,6 +1,5 @@
 import * as assert from 'assert';
-import { CodeUtil, getSelectedText } from '../../../common/codeUtil';
-import * as vscode from 'vscode';
+import { CodeUtil } from './codeUtil';
 
 suite('Code utils', () => {
     suite('purify', () => {

src/test/suite/parser/parser.test.ts → src/parser/parser.test.ts

@@ -1,8 +1,8 @@
-import { getDocument } from '../../utils';
+import { getDocument } from '../test/utils';
 import * as assert from 'assert';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { Parser } from '../../../parser/parser';
+import { Parser } from '../parser/parser';
 
 suite('Parser', () => {
     suite('detectVariableByLine', () => {
@@ -81,11 +81,7 @@ suite('Parser', () => {
             __dirname,
             '..',
             '..',
-            '..',
-            '..',
             'src',
-            'test',
-            'suite',
             'parser',
             'samples',
         );

src/test/suite/providers/completionProvider/completionProvider.test.ts → src/providers/completionProvider.test.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import { assert } from 'chai';
-import { provideCompletionItemsInner } from '../../../../providers/completionProvider';
+import { provideCompletionItemsInner } from './completionProvider';
 
 // tests for completionItemsForMethod
 suite('completionProvider', () => {

src/test/suite/format/format.test.ts → src/providers/format.test.ts

@@ -1,14 +1,13 @@
-// TODO move to providers/formatting/formattingProvider.test.ts
-import { getDocument } from '../../utils';
+import { getDocument } from '../test/utils';
 import * as assert from 'assert';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import {
     FormatProvider,
     internalFormat,
-} from '../../../providers/formattingProvider';
-import { FormatOptions } from '../../../providers/formattingProvider.types';
+} from '../providers/formattingProvider';
+import { FormatOptions } from '../providers/formattingProvider.types';
 
 const inFilenameSuffix = '.in.ahk';
 const outFilenameSuffix = '.out.ahk';
@@ -111,12 +110,8 @@ const filesParentPath = path.join(
     __dirname,
     '..',
     '..',
-    '..',
-    '..',
     'src',
-    'test',
-    'suite',
-    'format',
+    'providers',
     'samples',
 );
 

src/test/suite/providers/formatting/formattingProvider.utils.test.ts → src/providers/formattingProvider.utils.test.ts

@@ -18,7 +18,7 @@ import {
     purify,
     removeEmptyLines,
     trimExtraSpaces,
-} from '../../../../providers/formattingProvider.utils';
+} from './formattingProvider.utils';
 
 suite('FormattingProvider utils', () => {
     // Default formatting options
@@ -1063,14 +1063,8 @@ suite('FormattingProvider utils', () => {
             __dirname,
             '..',
             '..',
-            '..',
-            '..',
-            '..',
             'src',
-            'test',
-            'suite',
             'providers',
-            'formatting',
             'samples',
         );
 

src/test/suite/service/runnerService.test.ts → src/service/runnerService.test.ts

@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import { makeCompileCommand } from '../../../service/runnerService';
+import { makeCompileCommand } from './runnerService';
 
 suite('runnerService', () => {
     suite('makeCompileCommand', () => {

src/test/suite/index.ts

@@ -10,7 +10,7 @@ export function run(): Promise<void> {
     (mocha as any).color();
     mocha.timeout(0);
 
-    const testsRoot = path.resolve(__dirname, '..');
+    const testsRoot = path.resolve(__dirname, '../..');
 
     return new Promise((c, e) => {
         glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {