Remove some explicit setup/teardown code in tests

J-Fields · J-Fields · commit 4cc77671987c · 2025-12-04T19:45:52.000-05:00
diff --git a/test/actions/insertLine.test.ts b/test/actions/insertLine.test.ts
@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import * as vscode from 'vscode';
 import { getAndUpdateModeHandler } from '../../extension';
 import { ModeHandler } from '../../src/mode/modeHandler';
-import { cleanUpWorkspace, setupWorkspace } from '../testUtils';
+import { setupWorkspace } from '../testUtils';
 
 suite('insertLineBefore', () => {
   let modeHandler: ModeHandler;
@@ -18,8 +18,6 @@ suite('insertLineBefore', () => {
     modeHandler = (await getAndUpdateModeHandler())!;
   });
 
-  suiteTeardown(cleanUpWorkspace);
-
   test('tabs are added to match previous line even if line above does not match', async () => {
     // Setup the test
     await modeHandler.handleMultipleKeyEvents(['<Esc>', 'g', 'g', 'd', 'G']);
diff --git a/test/cmd_line/breakpoints.test.ts b/test/cmd_line/breakpoints.test.ts
@@ -5,7 +5,7 @@ import { getAndUpdateModeHandler } from '../../extension';
 import { ExCommandLine } from '../../src/cmd_line/commandLine';
 import { ModeHandler } from '../../src/mode/modeHandler';
 import { exCommandParser } from '../../src/vimscript/exCommandParser';
-import { cleanUpWorkspace, setupWorkspace } from '../testUtils';
+import { setupWorkspace } from '../testUtils';
 
 function clearBreakpoints() {
   vscode.debug.removeBreakpoints(vscode.debug.breakpoints);
@@ -18,7 +18,6 @@ suite('Breakpoints command', () => {
     await setupWorkspace();
     modeHandler = (await getAndUpdateModeHandler())!;
   });
-  suiteTeardown(cleanUpWorkspace);
 
   test('`:breaka` adds breakpoint', async () => {
     clearBreakpoints();
diff --git a/test/cmd_line/change.test.ts b/test/cmd_line/change.test.ts
@@ -1,10 +1,7 @@
 import { Mode } from '../../src/mode/mode';
 import { newTest } from '../testSimplifier';
-import { setupWorkspace } from '../testUtils';
 
 suite('cmd_line change', () => {
-  suiteSetup(setupWorkspace);
-
   newTest({
     title: 'c deletes current line and enters insert mode',
     start: ['first line', 'sec|ond line', 'third line'],
diff --git a/test/cmd_line/smile.test.ts b/test/cmd_line/smile.test.ts
@@ -15,7 +15,7 @@ suite('Smile command', () => {
     modeHandler = (await getAndUpdateModeHandler())!;
   });
 
-  test(':smile creates new tab', async () => {
+  test(':smile creates new tab containing smile', async () => {
     await new ExCommandLine('smile', modeHandler.vimState.currentMode).run(modeHandler.vimState);
     await waitForTabChange();
 
@@ -24,13 +24,7 @@ suite('Smile command', () => {
       1,
       ':smile did not create a new untitled file',
     );
-  });
-
-  test(':smile editor contains smile text', async () => {
-    await new ExCommandLine('smile', modeHandler.vimState.currentMode).run(modeHandler.vimState);
-    await waitForTabChange();
-    const textArray = SmileCommand.smileText.split('\n');
 
-    assertEqualLines(textArray);
+    assertEqualLines(SmileCommand.smileText.split('\n'));
   });
 });
diff --git a/test/cmd_line/substitute.test.ts b/test/cmd_line/substitute.test.ts
@@ -1,6 +1,6 @@
 import { Configuration } from '../testConfiguration';
 import { newTest } from '../testSimplifier';
-import { cleanUpWorkspace, reloadConfiguration, setupWorkspace } from './../testUtils';
+import { reloadConfiguration, setupWorkspace } from './../testUtils';
 
 function sub(
   pattern: string,
@@ -15,7 +15,6 @@ function sub(
 
 suite('Basic substitute', () => {
   setup(setupWorkspace);
-  suiteTeardown(cleanUpWorkspace);
 
   newTest({
     title: 'Replace single word once',
diff --git a/test/cmd_line/writequit.test.ts b/test/cmd_line/writequit.test.ts
@@ -5,7 +5,7 @@ import { getAndUpdateModeHandler } from '../../extension';
 import { ExCommandLine } from '../../src/cmd_line/commandLine';
 import { ModeHandler } from '../../src/mode/modeHandler';
 import { newTest } from '../testSimplifier';
-import { cleanUpWorkspace, setupWorkspace, waitForEditorsToClose } from './../testUtils';
+import { setupWorkspace, waitForEditorsToClose } from './../testUtils';
 
 suite('Basic write-quit', () => {
   let modeHandler: ModeHandler;
@@ -15,8 +15,6 @@ suite('Basic write-quit', () => {
     modeHandler = (await getAndUpdateModeHandler())!;
   });
 
-  suiteTeardown(cleanUpWorkspace);
-
   test('Run write and quit', async () => {
     await modeHandler.handleMultipleKeyEvents(['i', 'a', 'b', 'a', '<Esc>']);
 
diff --git a/test/completion/lineCompletion.test.ts b/test/completion/lineCompletion.test.ts
@@ -5,7 +5,7 @@ import { getAndUpdateModeHandler } from '../../extension';
 import { getCompletionsForCurrentLine } from '../../src/completion/lineCompletionProvider';
 import { ModeHandler } from '../../src/mode/modeHandler';
 import { VimState } from '../../src/state/vimState';
-import { cleanUpWorkspace, setupWorkspace } from '../testUtils';
+import { setupWorkspace } from '../testUtils';
 
 suite('Provide line completions', () => {
   let modeHandler: ModeHandler;
@@ -16,7 +16,6 @@ suite('Provide line completions', () => {
     modeHandler = (await getAndUpdateModeHandler())!;
     vimState = modeHandler.vimState;
   });
-  suiteTeardown(cleanUpWorkspace);
 
   const setupTestWithLines = async (lines: string[]) => {
     vimState.cursorStopPosition = new Position(0, 0);
diff --git a/test/configuration/langmap.test.ts b/test/configuration/langmap.test.ts
@@ -1,6 +1,6 @@
 import { Mode } from '../../src/mode/mode';
 import { newTest } from '../testSimplifier';
-import { cleanUpWorkspace, setupWorkspace } from '../testUtils';
+import { setupWorkspace } from '../testUtils';
 
 const dvorakLangmap =
   '\'q,\\,w,.e,pr,yt,fy,gu,ci,ro,lp,/[,=],aa,os,ed,uf,ig,dh,hj,tk,nl,s\\;,-\',\\;z,qx,jc,kv,xb,bn,mm,w\\,,v.,z/,[-,]=,"Q,<W,>E,PR,YT,FY,GU,CI,RO,LP,?{,+},AA,OS,ED,UF,IG,DH,HJ,TK,NL,S:,_",:Z,QX,JC,KV,XB,BN,MM,W<,V>,Z?';
@@ -13,14 +13,6 @@ suite('Langmap', () => {
       },
     });
   });
-  suiteTeardown(async () => {
-    await setupWorkspace({
-      config: {
-        langmap: '',
-      },
-    });
-    await cleanUpWorkspace();
-  });
 
   newTest({
     title: 'Test example binding (ee → dd)',
diff --git a/test/jumpTracker.test.ts b/test/jumpTracker.test.ts
@@ -5,11 +5,8 @@ import { Position } from 'vscode';
 import { JumpTracker } from '../src/jumps/jumpTracker';
 import { Jump } from './../src/jumps/jump';
 import { ITestObject, newTest, newTestSkip } from './testSimplifier';
-import { setupWorkspace } from './testUtils';
 
 suite('Record and navigate jumps', () => {
-  suiteSetup(setupWorkspace);
-
   const newJumpTest = (options: ITestObject | Omit<ITestObject, 'title'>) => {
     return newTest({
       title: `Can track jumps for keys: ${options.keysPressed.replace(/\n/g, '<CR>')}`,
diff --git a/test/marks.test.ts b/test/marks.test.ts
@@ -5,7 +5,7 @@ import { Mode } from '../src/mode/mode';
 import { ModeHandler } from '../src/mode/modeHandler';
 import { ModeHandlerMap } from '../src/mode/modeHandlerMap';
 import { newTest, newTestSkip } from './testSimplifier';
-import { cleanUpWorkspace, setupWorkspace } from './testUtils';
+import { setupWorkspace } from './testUtils';
 
 suite('Marks', () => {
   let modeHandler: ModeHandler;
@@ -15,8 +15,6 @@ suite('Marks', () => {
     modeHandler = (await getAndUpdateModeHandler())!;
   });
 
-  suiteTeardown(cleanUpWorkspace);
-
   const jumpToNewFile = async () => {
     await setupWorkspace({
       config: {
diff --git a/test/mode/modeNormal.test.ts b/test/mode/modeNormal.test.ts
@@ -17,7 +17,6 @@ suite('Mode Normal', () => {
     });
     modeHandler = (await getAndUpdateModeHandler())!;
   });
-  suiteTeardown(cleanUpWorkspace);
 
   test('Can be activated', async () => {
     const activationKeys = ['<Esc>', '<C-[>'];
