Reset extension between tests (#318)

Author: satyakigh

src/document/DocumentManager.ts

@@ -183,6 +183,10 @@ export class DocumentManager implements SettingsConfigurable, Closeable {
         return [...this.documentMap.values()].filter((doc) => doc.isTemplate() && doc.extension === extension).length;
     }
 
+    clear() {
+        this.documentMap.clear();
+    }
+
     close() {
         clearInterval(this.interval);
     }

src/settings/SettingsManager.ts

@@ -8,7 +8,7 @@ import { toString } from '../utils/String';
 import { PartialDataObserver, SubscriptionManager } from '../utils/SubscriptionManager';
 import { parseWithPrettyError } from '../utils/ZodErrorWrapper';
 import { ISettingsSubscriber, SettingsPathKey } from './ISettingsSubscriber';
-import { Settings, SettingsState } from './Settings';
+import { DefaultSettings, Settings, SettingsState } from './Settings';
 import { parseSettings } from './SettingsParser';
 
 const logger = LoggerFactory.getLogger('SettingsManager');
@@ -29,6 +29,10 @@ export class SettingsManager implements ISettingsSubscriber {
         return this.settingsState.toSettings();
     }
 
+    reset() {
+        this.validateAndUpdate(DefaultSettings);
+    }
+
     /**
      * Subscribe to settings changes
      * Overloaded to support both full and partial subscriptions

src/usageTracker/UsageTracker.ts

@@ -24,4 +24,8 @@ export class UsageTracker {
             return this.events.has(event);
         });
     }
+
+    clear() {
+        this.events.clear();
+    }
 }

tst/e2e/CodeLens.test.ts

@@ -1,15 +1,18 @@
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest';
 import { CodeLens } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 
 describe('CodeLens', () => {
-    let client: TestExtension;
+    const client = new TestExtension();
 
     beforeAll(async () => {
-        client = new TestExtension();
         await client.ready();
     });
 
+    beforeEach(async () => {
+        await client.reset();
+    });
+
     afterAll(async () => {
         await client.close();
     });

tst/e2e/Completion.test.ts

@@ -1,15 +1,18 @@
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest';
 import { getSimpleYamlTemplateText, getSimpleJsonTemplateText } from '../utils/TemplateUtils';
 import { TestExtension } from '../utils/TestExtension';
 
 describe('Completion', () => {
-    let client: TestExtension;
+    const client = new TestExtension();
 
     beforeAll(async () => {
-        client = new TestExtension();
         await client.ready();
     });
 
+    beforeEach(async () => {
+        await client.reset();
+    });
+
     afterAll(async () => {
         await client.close();
     });

tst/e2e/Completion.yaml.test.ts

@@ -1,17 +1,17 @@
-import { beforeEach, afterEach, describe, expect, test } from 'vitest';
+import { beforeEach, describe, expect, test, afterAll } from 'vitest';
 import { CompletionList } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
 
 describe('Completion Tests', () => {
     const documentUri = 'file:///test.yaml';
-    let extension: TestExtension;
+    const extension = new TestExtension();
 
-    beforeEach(() => {
-        extension = new TestExtension();
+    beforeEach(async () => {
+        await extension.reset();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/DocumentHandler.test.ts

@@ -1,17 +1,21 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterAll } from 'vitest';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
 
 describe('DocumentHandler', () => {
     const uri = 'file:///test.yaml';
 
-    let extension: TestExtension;
+    const extension = new TestExtension();
 
-    beforeEach(() => {
-        extension = new TestExtension();
+    beforeEach(async () => {
+        await extension.reset();
     });
 
-    afterEach(async () => {
+    beforeEach(async () => {
+        await extension.reset();
+    });
+
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/DocumentSymbol.test.ts

@@ -1,15 +1,18 @@
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from 'vitest';
 import { DocumentSymbol, SymbolKind } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 
 describe('DocumentSymbol', () => {
-    let client: TestExtension;
+    const client = new TestExtension();
 
     beforeAll(async () => {
-        client = new TestExtension();
         await client.ready();
     });
 
+    beforeEach(async () => {
+        await client.reset();
+    });
+
     afterAll(async () => {
         await client.close();
     });

tst/e2e/ExtractAllOccurrencesToParameter.test.ts

@@ -1,16 +1,16 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterAll } from 'vitest';
 import { CodeAction, CodeActionKind, Range, TextEdit } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
 
 describe('Extract All Occurrences to Parameter', () => {
-    let extension: TestExtension;
+    const extension = new TestExtension();
 
-    beforeEach(() => {
-        extension = new TestExtension();
+    beforeEach(async () => {
+        await extension.reset();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });
 

tst/e2e/ExtractToParameter.json.test.ts

@@ -1,17 +1,17 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterAll } from 'vitest';
 import { CodeAction, CodeActionKind, Range, TextEdit } from 'vscode-languageserver';
 import { TestExtension } from '../utils/TestExtension';
 import { WaitFor } from '../utils/Utils';
 import { applyWorkspaceEdit } from '../utils/WorkspaceEditUtils';
 
 describe('Extract to Parameter - JSON Tests', () => {
-    let extension: TestExtension;
+    const extension = new TestExtension();
 
-    beforeEach(() => {
-        extension = new TestExtension();
+    beforeEach(async () => {
+        await extension.reset();
     });
 
-    afterEach(async () => {
+    afterAll(async () => {
         await extension.close();
     });