various additional test fixes

Author: Ellpeck

src/test/hover-values.test.ts

@@ -4,13 +4,12 @@ import assert from 'assert';
 
 
 suite('hover values', () => {
-	let editor: vscode.TextEditor;
 	suiteSetup(async() => {
 		await activateExtension();
-		editor = await openTestFile('hover-values-example.R');
 	});
 
 	const tc = async(pos: vscode.Position, expected: string) => {
+		const editor = await openTestFile('hover-values-example.R');
 		const result: vscode.Hover[] = await vscode.commands.executeCommand('vscode.executeHoverProvider', editor.document.uri, pos);
 		assert.ok(result, 'failed to get result');
 		assert.equal(result.length, 1, `expected 1 result but got ${result.length}`);

src/test/test-util.ts

@@ -7,21 +7,23 @@ import type { FlowrInternalSession } from '../flowr/internal-session';
 import type { FlowrExtensionApi } from '../extension';
 
 /**
- * Activate the extension and return its {@link FlowrExtensionApi}
+ * Activate the extension (if not already active) and return its {@link FlowrExtensionApi}
  */
 export async function activateExtension(): Promise<FlowrExtensionApi> {
 	const ext = vscode.extensions.getExtension('code-inspect.vscode-flowr');
 
 	assert.notEqual(ext, undefined, 'extension not found');
 
 	await assert.doesNotReject(async() => {
-		await ext?.activate();
+		if(!ext?.isActive) {
+			await ext?.activate();
+		}
 	}, 'extension activation failed');
 
 	const api = (ext as vscode.Extension<FlowrExtensionApi>).exports;
 	assert.notEqual(api, undefined, 'extension api not found');
 
-	// force start a local shell and wait, since there seem to be some async issues with commands
+	// force (re-)start local shell and wait, since there seem to be some async issues with commands
 	const session: FlowrInternalSession = await vscode.commands.executeCommand('vscode-flowr.session.internal');
 	assert.equal(session.state, 'active');