From 5b6a653f79b95c24bd2339a049de05c20f5b8bf9 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori" <exkazuu@gmail.com>
Date: Tue, 6 Oct 2026 16:17:24 +0900
Subject: [PATCH] test: isolate typeof fixture checks from query setup

Load the shipped grammar and compile configured queries once before the
three independent fixture checks. Keep each fixture's five-second deadline
and all existing public-tree, capture and incremental edit assertions.

Co-authored-by: WillBooster (Codex CLI) <agent@willbooster.com>
---
 test/unit/typeof.test.ts | 51 ++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/test/unit/typeof.test.ts b/test/unit/typeof.test.ts
index f638bf0..4f2b6fe 100644
--- a/test/unit/typeof.test.ts
+++ b/test/unit/typeof.test.ts
@@ -1,8 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import assert from 'node:assert/strict';
-import { Parser, Query, Edit, type Node, type Tree } from '@willbooster/web-tree-sitter';
-import { test } from 'vitest';
+import { type Language, Parser, Query, Edit, type Node, type Tree } from '@willbooster/web-tree-sitter';
+import { afterAll, beforeAll, test } from 'vitest';
 import { loadCurrentWasmBuild } from './wasmBuild.js';
 const root = path.resolve(import.meta.dirname, '../..');
 const snapshot = (node: Node): unknown => ({
@@ -17,22 +17,36 @@ const snapshot = (node: Node): unknown => ({
   endPosition: node.endPosition,
   children: node.children.map((n, i) => ({ field: node.fieldNameForChild(i), node: snapshot(n) })),
 });
-await Parser.init();
-test('preserves typeof type fields, configured captures and contextual names after edits', async () => {
-  const language = await loadCurrentWasmBuild();
-  const parser = new Parser();
-  let types: Query | undefined, highlights: Query | undefined, tags: Query | undefined;
-  try {
-    parser.setLanguage(language);
-    types = new Query(language, '(type_specifier/typeof_specifier) @type');
-    highlights = new Query(
+let language: Language;
+const queries: Query[] = [];
+
+beforeAll(async () => {
+  await Parser.init();
+  language = await loadCurrentWasmBuild();
+  queries.push(new Query(language, '(type_specifier/typeof_specifier) @type'));
+  queries.push(
+    new Query(
       language,
       ['queries/c/highlights.scm', 'queries/highlights.scm']
         .map((f) => fs.readFileSync(path.join(root, f), 'utf8'))
         .join('\n')
-    );
-    tags = new Query(language, fs.readFileSync(path.join(root, 'queries/tags.scm'), 'utf8'));
-    for (const file of ['typeofCpp.cpp', 'typeofNames.cpp', 'typeofGccNames.cpp']) {
+    )
+  );
+  queries.push(new Query(language, fs.readFileSync(path.join(root, 'queries/tags.scm'), 'utf8')));
+}, 30_000);
+
+afterAll(() => {
+  for (const query of queries) query.delete();
+});
+
+test.each(['typeofCpp.cpp', 'typeofNames.cpp', 'typeofGccNames.cpp'])(
+  'preserves typeof type fields, configured captures and contextual names after edits (%s)',
+  (file) => {
+    const [types, highlights, tags] = queries;
+    assert.ok(types && highlights && tags);
+    const parser = new Parser();
+    try {
+      parser.setLanguage(language);
       const source = fs.readFileSync(path.join(root, 'test/fixtures', file), 'utf8');
       let tree: Tree | undefined,
         edited: Tree | undefined,
@@ -225,11 +239,8 @@ test('preserves typeof type fields, configured captures and contextual names aft
         restored?.delete();
         restoredFresh?.delete();
       }
+    } finally {
+      parser.delete();
     }
-  } finally {
-    types?.delete();
-    highlights?.delete();
-    tags?.delete();
-    parser.delete();
   }
-});
+);