From 219b9b25eb6da8fe75c370ab0baa3969767b6364 Mon Sep 17 00:00:00 2001
From: Alex Dima <alexdima@microsoft.com>
Date: Sat, 13 Nov 2021 20:37:28 +0100
Subject: [PATCH] Restore basic-languages unit tests

---
 package.json                                  |  2 +-
 {monaco-languages/test => test/unit}/all.js   | 16 +++++++---------
 {monaco-languages/test => test/unit}/setup.js |  0
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename {monaco-languages/test => test/unit}/all.js (65%)
 rename {monaco-languages/test => test/unit}/setup.js (100%)

diff --git a/package.json b/package.json
index 29b8de2c..288a3b42 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
 		"import-typescript": "node ./build/importTypescript",
 		"watch": "tsc -w -p ./src",
 		"release-plugins": "node ./build/build",
-		"test": "node ./monaco-languages/test/all.js",
+		"test": "node ./test/unit/all.js",
 		"gulp-release": "gulp release",
 		"release": "npm-run-all -ls release-plugins gulp-release",
 		"website": "gulp build-website && npm run typedoc && gulp prepare-website-branch",
diff --git a/monaco-languages/test/all.js b/test/unit/all.js
similarity index 65%
rename from monaco-languages/test/all.js
rename to test/unit/all.js
index 828ae45f..68a9bbd1 100644
--- a/monaco-languages/test/all.js
+++ b/test/unit/all.js
@@ -4,13 +4,11 @@ const glob = require('glob');
 const path = require('path');
 
 requirejs.config({
-	baseUrl: 'monaco-languages',
+	baseUrl: '',
 	paths: {
-		'vs/css': 'test/css.mock',
-		'vs/nls': 'test/nls.mock',
-		'vs/basic-languages/fillers/monaco-editor-core': 'out/amd/fillers/monaco-editor-core-amd',
-		'vs/basic-languages': 'out/amd',
-		vs: '../node_modules/monaco-editor-core/dev/vs'
+		'vs/fillers/monaco-editor-core': 'out/amd/fillers/monaco-editor-core-amd',
+		'vs/basic-languages': 'out/amd/basic-languages',
+		vs: './node_modules/monaco-editor-core/dev/vs'
 	},
 	nodeRequire: require
 });
@@ -35,15 +33,15 @@ global.window = {
 };
 
 requirejs(
-	['test/setup'],
+	['test/unit/setup'],
 	function () {
-		glob('out/amd/*/*.test.js', { cwd: path.dirname(__dirname) }, function (err, files) {
+		glob('out/amd/basic-languages/*/*.test.js', { cwd: path.join(__dirname, '../../') }, function (err, files) {
 			if (err) {
 				console.log(err);
 				return;
 			}
 			requirejs(
-				files.map((f) => f.replace(/^out\/amd/, 'vs/basic-languages').replace(/\.js$/, '')),
+				files.map((f) => f.replace(/^out\/amd/, 'vs').replace(/\.js$/, '')),
 				function () {
 					// We can launch the tests!
 				},
diff --git a/monaco-languages/test/setup.js b/test/unit/setup.js
similarity index 100%
rename from monaco-languages/test/setup.js
rename to test/unit/setup.js