Fixed tests

Author: ecmel

src/extension.ts

@@ -27,6 +27,10 @@ export class ClassCompletionItemProvider implements CompletionItemProvider {
     readonly findLinkRel = /rel\s*=\s*(["'])((?:(?!\1).)+)\1/si;
     readonly findLinkHref = /href\s*=\s*(["'])((?:(?!\1).)+)\1/si;
 
+    getRemoteStyleSheets(uri: Uri): string[] {
+        return workspace.getConfiguration("css", uri).get<string[]>("remoteStyleSheets", []);
+    }
+
     parseTextToItems(text: string, items: Map<string, CompletionItem>) {
         walk(parse(text), node => {
             if (node.type === "ClassSelector") {
@@ -97,8 +101,7 @@ export class ClassCompletionItemProvider implements CompletionItemProvider {
     findRemoteStyles(uri: Uri): Thenable<Set<string>> {
         return new Promise(resolve => {
             const keys = new Set<string>();
-            const config = workspace.getConfiguration("css", uri);
-            const remoteStyleSheets = config.get<string[]>("remoteStyleSheets", []);
+            const remoteStyleSheets = this.getRemoteStyleSheets(uri);
 
             if (remoteStyleSheets.length === 0) {
                 resolve(keys);

src/test/suite/extension.test.ts

@@ -2,15 +2,11 @@ import * as assert from 'assert';
 import { ClassCompletionItemProvider } from '../../extension';
 import {
 	workspace,
-	TextDocument,
 	Position,
 	CancellationToken,
 	Event,
 	CompletionContext,
 	CompletionTriggerKind,
-	EndOfLine,
-	Range,
-	TextLine,
 	Uri,
 	CompletionItem
 } from 'vscode';
@@ -29,48 +25,6 @@ class MockCompletionContext implements CompletionContext {
 	triggerCharacter?: string | undefined;
 }
 
-class MockTextDocument implements TextDocument {
-	uri!: Uri;
-	fileName!: string;
-	isUntitled!: boolean;
-	languageId!: string;
-	version!: number;
-	isDirty!: boolean;
-	isClosed!: boolean;
-	eol!: EndOfLine;
-	lineCount!: number;
-	readonly #text: string;
-
-	constructor(text: string) {
-		this.#text = text;
-	}
-
-	getText(range?: Range): string {
-		return this.#text;
-	}
-	save(): Thenable<boolean> {
-		throw new Error('Method not implemented.');
-	}
-	lineAt(position: Position | number | any): TextLine | any {
-		throw new Error('Method not implemented.');
-	}
-	offsetAt(position: Position): number {
-		throw new Error('Method not implemented.');
-	}
-	positionAt(offset: number): Position {
-		throw new Error('Method not implemented.');
-	}
-	getWordRangeAtPosition(position: Position, regex?: RegExp): Range | undefined {
-		throw new Error('Method not implemented.');
-	}
-	validateRange(range: Range): Range {
-		throw new Error('Method not implemented.');
-	}
-	validatePosition(position: Position): Position {
-		throw new Error('Method not implemented.');
-	}
-}
-
 suite('Extension Test Suite', () => {
 
 	const position = new Position(0, 0);
@@ -135,51 +89,76 @@ suite('Extension Test Suite', () => {
 		"`)?.[2], "http://example.com/example.css");
 	});
 
-	test('Rejects empty documents', done => {
+	test('Rejects outside class attribute', async () => {
 		const provider = new ClassCompletionItemProvider();
-		const document = new MockTextDocument(``);
-		const result = provider.provideCompletionItems(document, position, token, context) as Thenable<CompletionItem[]>;
-
-		result.then(items => done(items), () => done());
+		const content = `<a class=""></a>`;
+		const document = await workspace.openTextDocument({ content, language: "html" });
+
+		try {
+			const items = await (provider.provideCompletionItems(
+				document,
+				document.positionAt(content.length),
+				token,
+				context) as Thenable<CompletionItem[]>);
+
+			assert.strictEqual(items.length, 0);
+		} catch (e) {
+			assert.strictEqual(e, undefined);
+		}
 	});
 
-	test('Rejects outside class attribute', done => {
+	test('Completes from style tag', async () => {
 		const provider = new ClassCompletionItemProvider();
-		const document = new MockTextDocument(`<a class=""></a>`);
-		const result = provider.provideCompletionItems(document, position, token, context) as Thenable<CompletionItem[]>;
+		const content = `<style>.test{}</style><a class="`;
+		const document = await workspace.openTextDocument({ content, language: "html" });
+
+		const items = await (provider.provideCompletionItems(
+			document,
+			document.positionAt(content.length),
+			token,
+			context) as Thenable<CompletionItem[]>);
 
-		result.then(items => done(items), () => done());
+		assert.strictEqual(items.length, 1);
 	});
 
-	test('Completes from style tag', done => {
+	test('Completes from link tag', async () => {
 		const provider = new ClassCompletionItemProvider();
-		const document = new MockTextDocument(`<style>.test{}</style><a class="`);
+		const content = `
+			<link 
+				href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" 
+				rel="stylesheet"
+			>
+			<a class="`;
+		const document = await workspace.openTextDocument({ content, language: "html" });
+
+		const items = await (provider.provideCompletionItems(
+			document,
+			document.positionAt(content.length),
+			token,
+			context) as Thenable<CompletionItem[]>);
+
+		assert.notStrictEqual(items.length, 0);
+	});
 
-		const result = provider.provideCompletionItems(document, position, token, context) as Thenable<CompletionItem[]>;
 
-		result.then(items => {
-			try {
-				assert.strictEqual(items.length, 1);
-				done();
-			} catch (e) {
-				done(e);
+	test('Completes from remote style', async () => {
+		const provider = new class extends ClassCompletionItemProvider {
+			getRemoteStyleSheets(uri: Uri): string[] {
+				return [
+					"https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
+				];
 			}
-		}, done);
-	});
+		}();
 
-	test('Completes from link tag', done => {
-		const provider = new ClassCompletionItemProvider();
-		const document = new MockTextDocument(`<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"><a class="`);
+		const content = `<a class="`;
+		const document = await workspace.openTextDocument({ content, language: "html" });
 
-		const result = provider.provideCompletionItems(document, position, token, context) as Thenable<CompletionItem[]>;
+		const items = await (provider.provideCompletionItems(
+			document,
+			document.positionAt(content.length),
+			token,
+			context) as Thenable<CompletionItem[]>);
 
-		result.then(items => {
-			try {
-				assert.notStrictEqual(items.length, 0);
-				done();
-			} catch (e) {
-				done(e);
-			}
-		}, done);
+		assert.notStrictEqual(items.length, 0);
 	});
 });