Update VSIX tests to be compliant with latest glob dependency (#1248)

g2vinay · web-flow · commit ef242e4f2199 · 2025-11-25T14:54:36.000-08:00
* update tests

* refactor
diff --git a/servers/Azure.Mcp.Server/vscode/src/test/suite/allTests.ts b/servers/Azure.Mcp.Server/vscode/src/test/suite/allTests.ts
@@ -3,26 +3,22 @@
 
 import * as path from 'path';
 import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import { glob } from 'glob';
 
 export function run(): Promise<void> {
     const opts: Mocha.MochaOptions = {
         ui: 'tdd',
         color: true,
         timeout: process.env.TEST_TIMEOUT ?? "10s"
     };
-    
+
     const mocha = new Mocha(opts);
 
     const testsRoot = path.resolve(__dirname, '..');
 
     return new Promise((c, e) => {
-        glob('suite/**/**.test.js', { cwd: testsRoot }, (err, files) => {
-            if (err) {
-                return e(err);
-            }
-
-            files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+        glob('suite/**/**.test.js', { cwd: testsRoot }).then((files: string[]) => {
+            files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f)));
 
             try {
                 mocha.run(failures => {
@@ -36,6 +32,6 @@ export function run(): Promise<void> {
                 console.error(err);
                 e(err);
             }
-        });
+        }).catch(e);
     });
 }
diff --git a/servers/Azure.Mcp.Server/vscode/src/test/suite/unitTests.ts b/servers/Azure.Mcp.Server/vscode/src/test/suite/unitTests.ts
@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import { glob } from 'glob';
 
 export function run(): Promise<void> {
     const opts: Mocha.MochaOptions = {
@@ -14,21 +14,16 @@ export function run(): Promise<void> {
     };
 
     const mocha = new Mocha(opts);
-
     const testsRoot = path.resolve(__dirname, '..');
 
     return new Promise((c, e) => {
         // Find both legacy and new-style unit tests
-        glob('suite/unit/**/**.test.js', { cwd: testsRoot }, (err, suiteFiles) => {
-            if (err) {
-                return e(err);
-            }
-            glob('*.unit.test.js', { cwd: testsRoot }, (err2, unitFiles) => {
-                if (err2) {
-                    return e(err2);
-                }
-                const files = [...suiteFiles, ...unitFiles];
-                files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+        Promise.all([
+            glob('suite/unit/**/**.test.js', { cwd: testsRoot }),
+            glob('*.unit.test.js', { cwd: testsRoot })
+        ]).then(([suiteFiles, unitFiles]: [string[], string[]]) => {
+            const files = [...suiteFiles, ...unitFiles];
+            files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f)));
                 try {
                     mocha.run(failures => {
                         if (failures > 0) {
@@ -41,7 +36,6 @@ export function run(): Promise<void> {
                     console.error(err);
                     e(err);
                 }
-            });
-        });
+        }).catch(e);
     });
 }
diff --git a/servers/Fabric.Mcp.Server/vscode/src/test/suite/allTests.ts b/servers/Fabric.Mcp.Server/vscode/src/test/suite/allTests.ts
@@ -3,26 +3,22 @@
 
 import * as path from 'path';
 import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import { glob } from 'glob';
 
 export function run(): Promise<void> {
     const opts: Mocha.MochaOptions = {
         ui: 'tdd',
         color: true,
         timeout: process.env.TEST_TIMEOUT ?? "10s"
     };
-    
+
     const mocha = new Mocha(opts);
 
     const testsRoot = path.resolve(__dirname, '..');
 
     return new Promise((c, e) => {
-        glob('suite/**/**.test.js', { cwd: testsRoot }, (err, files) => {
-            if (err) {
-                return e(err);
-            }
-
-            files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+        glob('suite/**/**.test.js', { cwd: testsRoot }).then((files: string[]) => {
+            files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f)));
 
             try {
                 mocha.run(failures => {
@@ -36,6 +32,6 @@ export function run(): Promise<void> {
                 console.error(err);
                 e(err);
             }
-        });
+        }).catch(e);
     });
 }
diff --git a/servers/Fabric.Mcp.Server/vscode/src/test/suite/unitTests.ts b/servers/Fabric.Mcp.Server/vscode/src/test/suite/unitTests.ts
@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import { glob } from 'glob';
 
 export function run(): Promise<void> {
     const opts: Mocha.MochaOptions = {
@@ -19,16 +19,12 @@ export function run(): Promise<void> {
 
     return new Promise((c, e) => {
         // Find both legacy and new-style unit tests
-        glob('suite/unit/**/**.test.js', { cwd: testsRoot }, (err, suiteFiles) => {
-            if (err) {
-                return e(err);
-            }
-            glob('*.unit.test.js', { cwd: testsRoot }, (err2, unitFiles) => {
-                if (err2) {
-                    return e(err2);
-                }
-                const files = [...suiteFiles, ...unitFiles];
-                files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+        Promise.all([
+            glob('suite/unit/**/**.test.js', { cwd: testsRoot }),
+            glob('*.unit.test.js', { cwd: testsRoot })
+        ]).then(([suiteFiles, unitFiles]: [string[], string[]]) => {
+            const files = [...suiteFiles, ...unitFiles];
+            files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f)));
                 try {
                     mocha.run(failures => {
                         if (failures > 0) {
@@ -41,7 +37,6 @@ export function run(): Promise<void> {
                     console.error(err);
                     e(err);
                 }
-            });
-        });
+        }).catch(e);
     });
 }
diff --git a/servers/Template.Mcp.Server/vscode/src/test/suite/allTests.ts b/servers/Template.Mcp.Server/vscode/src/test/suite/allTests.ts
@@ -3,26 +3,22 @@
 
 import * as path from 'path';
 import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import { glob } from 'glob';
 
 export function run(): Promise<void> {
     const opts: Mocha.MochaOptions = {
         ui: 'tdd',
         color: true,
         timeout: process.env.TEST_TIMEOUT ?? "10s"
     };
-    
+
     const mocha = new Mocha(opts);
 
     const testsRoot = path.resolve(__dirname, '..');
 
     return new Promise((c, e) => {
-        glob('suite/**/**.test.js', { cwd: testsRoot }, (err, files) => {
-            if (err) {
-                return e(err);
-            }
-
-            files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+        glob('suite/**/**.test.js', { cwd: testsRoot }).then((files: string[]) => {
+            files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f)));
 
             try {
                 mocha.run(failures => {
@@ -36,6 +32,6 @@ export function run(): Promise<void> {
                 console.error(err);
                 e(err);
             }
-        });
+        }).catch(e);
     });
 }
diff --git a/servers/Template.Mcp.Server/vscode/src/test/suite/unitTests.ts b/servers/Template.Mcp.Server/vscode/src/test/suite/unitTests.ts
@@ -3,7 +3,7 @@
 
 import * as path from 'path';
 import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import { glob } from 'glob';
 
 export function run(): Promise<void> {
     const opts: Mocha.MochaOptions = {
@@ -19,16 +19,12 @@ export function run(): Promise<void> {
 
     return new Promise((c, e) => {
         // Find both legacy and new-style unit tests
-        glob('suite/unit/**/**.test.js', { cwd: testsRoot }, (err, suiteFiles) => {
-            if (err) {
-                return e(err);
-            }
-            glob('*.unit.test.js', { cwd: testsRoot }, (err2, unitFiles) => {
-                if (err2) {
-                    return e(err2);
-                }
-                const files = [...suiteFiles, ...unitFiles];
-                files.forEach(f => mocha.addFile(path.resolve(testsRoot, f)));
+        Promise.all([
+            glob('suite/unit/**/**.test.js', { cwd: testsRoot }),
+            glob('*.unit.test.js', { cwd: testsRoot })
+        ]).then(([suiteFiles, unitFiles]: [string[], string[]]) => {
+            const files = [...suiteFiles, ...unitFiles];
+            files.forEach((f: string) => mocha.addFile(path.resolve(testsRoot, f)));
                 try {
                     mocha.run(failures => {
                         if (failures > 0) {
@@ -41,7 +37,6 @@ export function run(): Promise<void> {
                     console.error(err);
                     e(err);
                 }
-            });
-        });
+        }).catch(e);
     });
 }
