Fix UT vscode

Author: F4r3n

.vscode/launch.json

@@ -10,7 +10,8 @@
         "request": "launch",
         "runtimeExecutable": "${execPath}",
         "env": {
-         // "ANALYZER_4D_PATH":""
+          "ANALYZER_4D_PATH":"",
+          "TOOL4D_DOWNLOAD":"false"
         },
         "args": [
           "--extensionDevelopmentPath=${workspaceFolder}/editor",

editor/src/config.ts

@@ -7,6 +7,7 @@ import * as lc from "vscode-languageclient/node";
 import { Ctx } from "./ctx";
 import { LabeledVersion } from './labeledVersion';
 import { InfoPlistManager } from './infoplist';
+import { Logger } from './logger';
 
 export class Config {
 
@@ -60,6 +61,10 @@ export class Config {
     }
 
     public IsTool4DEnabled(): boolean {
+        if(process.env["TOOL4D_DOWNLOAD"]!=undefined)
+        {
+            return process.env["TOOL4D_DOWNLOAD"] == 'true';
+        }
         return this._tool4dEnableFromSettings;
     }
 
@@ -101,7 +106,7 @@ export class Config {
 
     private get _serverPath() {
         const p = this._serverPathFromSettings;
-        if (this._tool4dEnableFromSettings) {
+        if (this.IsTool4DEnabled()) {
             return this._tool4DPath;
         }
         return p;

editor/src/test/index.ts

@@ -28,11 +28,12 @@ export function run(): Promise<void> {
 				return reject(err);
 			}
 
+
 			// Add files to the test suite
 			files.filter(f => {
-
+				if(!currentVersion)
+					return true;
 				const versionFile = tests[f] ? tests[f] : currentVersion;
-				console.log(f, versionFile, currentVersion, compareVersion(currentVersion, versionFile));
 				return compareVersion(currentVersion, versionFile) >= 0;
 			})
 				.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));

editor/src/test/runTest.ts

@@ -15,7 +15,6 @@ async function main() {
 		// The path to test runner
 		// Passed to --extensionTestsPath
 		const extensionTestsPath = path.resolve(__dirname, './index');
-		//process.env.ANALYZER_4D_PATH=process.env["ANALYZER_4D_PATH"]
 		// Download VS Code, unzip it and run the integration test
 		await runTests({ extensionDevelopmentPath, extensionTestsPath });
 	} catch (err) {

editor/src/test/toolDownload.test.ts

@@ -6,16 +6,22 @@ import * as assert from 'assert';
 import * as vscode from 'vscode';
 import * as fs from "fs";
 
+function prepareTargetFolder(inTarget)
+{
+    if(fs.existsSync(inTarget)) {
+        fs.rmSync(inTarget, {recursive:true});
+    }
+    fs.mkdirSync(inTarget);
+}
+
 //https://resources-download.4d.com/release/20.x/latest/latest/win/tool4d_win.tar.xz?debug
 suite('Download tool', () => {
     const downloadPath = getDocPath("Download");
-    if(fs.existsSync(downloadPath)) {
-        fs.rmSync(downloadPath, {recursive:true});
-    }
-    fs.mkdirSync(downloadPath);
 
 	const ext = vscode.extensions.getExtension('4D.4d-analyzer')!;
     test('Tool download stable', async () => {
+        prepareTargetFolder(downloadPath);
+
         let number = 21;
         await ext.activate();
 
@@ -41,8 +47,9 @@ suite('Download tool', () => {
         }
         await testDownloadLTS(downloadPath, lastVersionAvailable, "stable");
     });
-
     test('Tool download beta', async () => {
+        prepareTargetFolder(downloadPath);
+
         let number = 21;
         await ext.activate();
 
@@ -61,7 +68,6 @@ suite('Download tool', () => {
         const lastVersionAvailable = await requestLabelVersion(`https://resources-download.4d.com/release/${number} Rx/latest/latest/win/tool4d_win.tar.xz?channel=beta`, "beta")
         lastVersionAvailable.changelist = 0;
 
-
         await testDownloadR(downloadPath, lastVersionAvailable, "beta");
         if (lastVersionAvailable.releaseVersion >= 2) {
             await testDownloadRVersion(downloadPath, lastVersionAvailable, "beta");
@@ -82,8 +88,7 @@ async function testDownloadR(downloadPath: string, labeledVersion: LabeledVersio
             assert(result.currentVersion.releaseVersion === labeledVersion.releaseVersion);
             assert(result.currentVersion.changelist > 0);
         } catch (e) {
-            console.log("ERROR", e);
-            assert(false);
+            assert(false, e);
         }
     }
     else //If We are a 20R2
@@ -93,7 +98,7 @@ async function testDownloadR(downloadPath: string, labeledVersion: LabeledVersio
             const result = await toolPreparator.prepareLastToolWithoutProgress(downloadPath, false);
             assert(false);
         } catch (e) {
-            assert(true);
+            assert(true, e);
         }
     }
 }
@@ -107,7 +112,7 @@ async function testDownloadRVersion(downloadPath: string, labeledVersion: Labele
         assert(result.currentVersion.releaseVersion === labeledVersion.releaseVersion);
         assert(result.currentVersion.changelist > 0);
     } catch (e) {
-        assert(false);
+        assert(false, e);
     }
 }
 
@@ -121,7 +126,7 @@ async function testDownloadLTS(downloadPath: string, labeledVersion: LabeledVers
             assert(result.currentVersion.releaseVersion === 0);
             assert(result.currentVersion.changelist > 0);
         } catch (e) {
-            assert(false);
+            assert(false, e);
         }
     }
     else //If We are a 20R2