Clean up simple test IG (#73)

* Clean up simple test IG

* Add some contents back per Joshua

.vscode-test.js

@@ -2,6 +2,6 @@ const { defineConfig } = require('@vscode/test-cli');
 
 module.exports = defineConfig({
   label: 'Tests (Empty Folder)',
-  files: './dist/test/suite/runTests.js',
+  files: './dist/test/runTests.js',
   launchArgs: ['tests/empty', '--new-window', '--disable-extensions'],
 });

.vscode/launch.json

@@ -21,7 +21,7 @@
       "args": [
         "${workspaceFolder}/tests/empty",
         "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/dist/test/suite/index",
+        "--extensionTestsPath=${workspaceFolder}/dist/test/index",
         "--disable-extensions",
         "--new-window"
       ],

package.json

@@ -156,7 +156,7 @@
     "vscode:prepublish": "npm run compile",
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
-    "pretest": "npm run clean && npm run compile && cp -r src/test/suite/resources dist/test/suite/resources",
+    "pretest": "npm run clean && npm run compile && cp -r src/test/resources dist/test/resources",
     "clean": "rm -rf ./dist",
     "clean-all": "npm run clean && rm -rf ./jars",
     "test": "c8 --check-coverage --lines 80 --functions 80 --branches 80 vscode-test"

src/test/suite/buildParameters.test.ts → src/test/buildParameters.test.ts

@@ -2,26 +2,23 @@ import * as assert from 'assert';
 import path from 'path';
 import { ExtensionContext, extensions, window, workspace } from 'vscode';
 import { URI } from 'vscode-uri';
-import { buildParameters } from '../../buildParameters';
-import { ConnectionManager } from '../../connectionManager';
+import { buildParameters } from '../buildParameters';
+import { ConnectionManager } from '../connectionManager';
 
-const libraryUrl = path.resolve(__dirname, '../suite/resources/simple-test-ig/input/cql');
+const libraryUrl = path.resolve(__dirname, './resources/simple-test-ig/input/cql');
 const terminologyUrl = path.resolve(
   __dirname,
-  '../suite/resources/simple-test-ig/input/vocabulary/valueset',
-);
-const modelUrl = path.resolve(
-  __dirname,
-  '../suite/resources/simple-test-ig/input/tests/Test/simple-test',
+  './resources/simple-test-ig/input/vocabulary/valueset',
 );
+const modelUrl = path.resolve(__dirname, './resources/simple-test-ig/input/tests/Test/simple-test');
 const remoteUrl = 'http://localhost:8000';
 async function showSpecificFile(filePath: string) {
   const document = await workspace.openTextDocument(filePath);
   await window.showTextDocument(document);
 }
 
 suite('buildParameters - Public API Testing', () => {
-  const testWorkspacePath = path.resolve(__dirname, '../suite/resources/simple-test-ig');
+  const testWorkspacePath = path.resolve(__dirname, './resources/simple-test-ig');
   const testFilePath = path.join(testWorkspacePath, 'input/cql/Test.cql');
   let connectionManager = ConnectionManager.getManager();
 

src/test/suite/connectionManager.test.ts → src/test/connectionManager.test.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import * as vscode from 'vscode';
-import { ConnectionManager, Context } from '../../connectionManager';
+import { ConnectionManager, Context } from '../connectionManager';
 
 suite('Connection Manager Test', () => {
   test('Connection Manager -- should be present', async function () {

src/test/suite/executeCQL.test.ts → src/test/executeCQL.test.ts

@@ -5,8 +5,8 @@ import { commands, Uri, window } from 'vscode';
 import { existsSync } from 'fs';
 import { createFileSync, removeSync } from 'fs-extra';
 import { join } from 'path';
-import { Commands } from '../../commands';
-import { executeCQL } from '../../executeCql';
+import { Commands } from '../commands';
+import { executeCQL } from '../executeCql';
 
 const OUT_FILE_PATH = join(__dirname, 'out.txt');
 const TERMINOLOGY_FILE_PATH = join(__dirname, 'terminology.txt');

src/test/suite/normalizeCqlExecution.test.ts → src/test/normalizeCqlExecution.test.ts

@@ -3,17 +3,17 @@ import path from 'path';
 import * as sinon from 'sinon';
 import { window } from 'vscode';
 import { URI } from 'vscode-uri';
-import * as buildParametersModule from '../../buildParameters';
-import * as executeCQLModule from '../../executeCql';
-import { normalizeCqlExecution } from '../../normalizeCqlExecution';
+import * as buildParametersModule from '../buildParameters';
+import * as executeCQLModule from '../executeCql';
+import { normalizeCqlExecution } from '../normalizeCqlExecution';
 
 suite('normalizeCqlExecution tests', () => {
   let stubShowErrorMessage: sinon.SinonStub;
   let stubShowInformationMessage: sinon.SinonStub;
   let stubBuildParameters: sinon.SinonStub;
   let stubExecuteCQL: sinon.SinonStub;
   let stubActiveTextEditor: sinon.SinonStub;
-  const testWorkspacePath = path.resolve(__dirname, '../suite/resources/simple-test-ig');
+  const testWorkspacePath = path.resolve(__dirname, '../resources/simple-test-ig');
   const testFilePath = path.join(testWorkspacePath, 'input/cql/Test.cql');
   const testFileUri = URI.file(testFilePath);