improve idea|

Author: Filip Pospisil

packages/extester/src/browser.ts

@@ -35,6 +35,7 @@ export class VSBrowser {
 	private codeVersion: string;
 	private releaseType: ReleaseQuality;
 	private logLevel: logging.Level;
+	private locale: string;
 	private static _instance: VSBrowser;
 	private readonly _startTimestamp: string;
 
@@ -43,13 +44,20 @@ export class VSBrowser {
 		return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}T${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`;
 	}
 
-	constructor(codeVersion: string, releaseType: ReleaseQuality, customSettings: object = {}, logLevel: logging.Level = logging.Level.INFO) {
+	constructor(
+		codeVersion: string,
+		releaseType: ReleaseQuality,
+		customSettings: object = {},
+		logLevel: logging.Level = logging.Level.INFO,
+		locale: string = '',
+	) {
 		this.storagePath = process.env.TEST_RESOURCES ? process.env.TEST_RESOURCES : path.resolve(DEFAULT_STORAGE_FOLDER);
 		this.extensionsFolder = process.env.EXTENSIONS_FOLDER ? process.env.EXTENSIONS_FOLDER : undefined;
 		this.customSettings = customSettings;
 		this.codeVersion = codeVersion;
 		this.releaseType = releaseType;
 		this.logLevel = logLevel;
+		this.locale = locale;
 		this._startTimestamp = this.formatTimestamp(new Date());
 
 		VSBrowser._instance = this;
@@ -87,7 +95,12 @@ export class VSBrowser {
 		fs.writeJSONSync(path.join(userSettings, 'settings.json'), defaultSettings);
 		console.log(`Writing code settings to ${path.join(userSettings, 'settings.json')}`);
 
-		const args = ['--no-sandbox', '--disable-dev-shm-usage', `--user-data-dir=${path.join(this.storagePath, 'settings')}`];
+		const args = ['--no-sandbox', '--disable-dev-shm-usage', `--user-data-dir=${path.join(this.storagePath, 'settings')}`]; // sem pridam locale
+
+		if (this.locale) {
+			console.log('locale is in args with value ' + this.locale);
+			args.push(`--locale ${this.locale}`);
+		}
 
 		if (this.extensionsFolder) {
 			args.push(`--extensions-dir=${this.extensionsFolder}`);
@@ -102,10 +115,14 @@ export class VSBrowser {
 			args.push(`--extensionDevelopmentPath=${process.env.EXTENSION_DEV_PATH}`);
 		}
 
+		console.log('args', args);
+
 		let options = new Options().setChromeBinaryPath(codePath).addArguments(...args) as any;
 		options['options_'].windowTypes = ['webview'];
 		options = options as Options;
 
+		console.log('options', options);
+
 		const prefs = new logging.Preferences();
 		prefs.setLevel(logging.Type.DRIVER, this.logLevel);
 		options.setLoggingPrefs(prefs);
@@ -117,6 +134,9 @@ export class VSBrowser {
 		}
 
 		console.log('Launching browser...');
+		// Print the full launch command for debugging
+		console.log('Launching VS Code with command:', `"${codePath}" ${args.join(' ')}`);
+
 		this._driver = await new Builder()
 			.setChromeService(new ServiceBuilder(chromeDriverBinaryPath))
 			.forBrowser(Browser.CHROME)

packages/extester/src/cli.ts

@@ -141,6 +141,7 @@ program
 				logLevel: cmd.log_level,
 				offline: cmd.offline,
 				resources: cmd.open_resource ?? [],
+				locale: cmd.locale,
 			});
 		}),
 	);
@@ -162,7 +163,7 @@ program
 	.option('-C, --coverage', 'Enable code coverage using c8')
 	.option('-r, --open_resource <resources...>', 'Open resources in VS Code. Multiple files and folders can be specified.')
 	.option('-n, --no_cache', 'Skip using cached version and download fresh copy without caching it', false)
-	.option('-L, --locale <locale>', 'to be defined')
+	.option('-L, --locale <locale>', 'to be defined22')
 	.action(
 		withErrors(async (testFiles, cmd) => {
 			const extest = new ExTester(cmd.storage, codeStream(cmd.type), cmd.extensions_dir, cmd.coverage);
@@ -180,6 +181,7 @@ program
 					config: cmd.mocha_config,
 					logLevel: cmd.log_level,
 					resources: cmd.open_resource ?? [],
+					locale: cmd.locale,
 				},
 			);
 		}),

packages/extester/src/extester.ts

@@ -232,6 +232,10 @@ export class ExTester {
 		setupOptions: Omit<SetupOptions, 'vscodeVersion'> = DEFAULT_SETUP_OPTIONS,
 		runOptions: Omit<RunOptions, 'vscodeVersion'> = DEFAULT_RUN_OPTIONS,
 	): Promise<number> {
+		console.log('setupAndRunTests');
+		console.log('setup options:', JSON.stringify(setupOptions, null, 2));
+		console.log('run options:', JSON.stringify(runOptions, null, 2));
+
 		await this.setupRequirements({ ...setupOptions, vscodeVersion }, runOptions.offline, runOptions.cleanup);
 		return await this.runTests(testFilesPattern, {
 			...runOptions,
@@ -247,6 +251,9 @@ export class ExTester {
 	 * @returns Promise resolving to the mocha process exit code - 0 for no failures, 1 otherwise
 	 */
 	async runTests(testFilesPattern: string | string[], runOptions: RunOptions = DEFAULT_RUN_OPTIONS): Promise<number> {
+		console.log('runTests');
+		console.log('run options:', JSON.stringify(runOptions, null, 2));
+
 		runOptions.vscodeVersion = loadCodeVersion(runOptions.vscodeVersion);
 		const patterns = typeof testFilesPattern === 'string' ? [testFilesPattern] : testFilesPattern;
 		return await this.code.runTests(patterns, runOptions);

packages/extester/src/suite/runner.ts

@@ -38,15 +38,25 @@ export class VSRunner {
 	private cleanup: boolean;
 	private tmpLink = path.join(os.tmpdir(), 'extest-code');
 	private releaseType: ReleaseQuality;
-
-	constructor(bin: string, codeVersion: string, customSettings: object = {}, cleanup: boolean = false, releaseType: ReleaseQuality, config?: string) {
+	private locale: string | undefined;
+
+	constructor(
+		bin: string,
+		codeVersion: string,
+		customSettings: object = {},
+		cleanup: boolean = false,
+		releaseType: ReleaseQuality,
+		config?: string,
+		locale?: string,
+	) {
 		const conf = this.loadConfig(config);
 		this.mocha = new Mocha(conf);
 		this.chromeBin = bin;
 		this.customSettings = customSettings;
 		this.codeVersion = codeVersion;
 		this.cleanup = cleanup;
 		this.releaseType = releaseType;
+		this.locale = locale;
 	}
 
 	/**
@@ -58,7 +68,7 @@ export class VSRunner {
 	runTests(testFilesPattern: string[], code: CodeUtil, logLevel: logging.Level = logging.Level.INFO, resources: string[]): Promise<number> {
 		return new Promise((resolve) => {
 			const self = this;
-			const browser: VSBrowser = new VSBrowser(this.codeVersion, this.releaseType, this.customSettings, logLevel);
+			const browser: VSBrowser = new VSBrowser(this.codeVersion, this.releaseType, this.customSettings, logLevel, this.locale);
 			let coverage: Coverage | undefined;
 
 			const testFiles = new Set<string>();

packages/extester/src/util/codeUtil.ts

@@ -46,6 +46,8 @@ export interface RunOptions {
 	offline?: boolean;
 	/** list of resources to be opened by VS Code */
 	resources: string[];
+	/** tbd */
+	locale?: string;
 }
 
 /** defaults for the [[RunOptions]] */
@@ -55,7 +57,7 @@ export const DEFAULT_RUN_OPTIONS = {
 	logLevel: logging.Level.INFO,
 	offline: false,
 	resources: [],
-	noCache: false,
+	noCache: false, //???
 };
 
 /**
@@ -321,6 +323,7 @@ export class CodeUtil {
 			runOptions.cleanup,
 			this.releaseType,
 			runOptions.config,
+			runOptions.locale,
 		);
 		return await runner.runTests(testFilesPattern, this, runOptions.logLevel, runOptions.resources);
 	}