Clean up unit tests

Author: vbabich

packages/grid/src/GridUtils.test.ts

@@ -1,8 +1,10 @@
+import { TestUtils } from '@deephaven/test-utils';
 import { type AxisRange, type BoundedAxisRange } from './GridAxisRange';
 import { type ModelIndex, type MoveOperation } from './GridMetrics';
 import type GridMetrics from './GridMetrics';
-import GridModel from './GridModel';
+import type GridModel from './GridModel';
 import GridRange, { type GridRangeIndex } from './GridRange';
+import GridTheme from './GridTheme';
 import GridUtils, { type Token, type TokenBox } from './GridUtils';
 
 function expectModelIndexes(
@@ -1114,42 +1116,52 @@ describe('getColumnSeparatorIndex', () => {
     allRowHeights: new Map(),
   });
 
-  class MockGroupedGridModel extends GridModel {
-    private headerGroups: Map<number, Map<number, string>>;
+  /**
+   * Creates a mock GridModel with grouped column headers for testing
+   */
+  const createMockGroupedGridModel = (
+    headerGroups: Map<number, Map<number, string>>
+  ): GridModel =>
+    TestUtils.createMockProxy<GridModel>({
+      columnCount: 4,
+      rowCount: 100,
+      columnHeaderMaxDepth: headerGroups.size,
+      textForColumnHeader: (column: ModelIndex, depth = 0) =>
+        headerGroups.get(depth)?.get(column) ?? '',
+    });
 
-    constructor(headerGroups: Map<number, Map<number, string>>) {
-      super();
-      this.headerGroups = headerGroups;
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    get rowCount(): number {
-      return 100;
-    }
-
-    // eslint-disable-next-line class-methods-use-this
-    get columnCount(): number {
-      return 4;
-    }
+  it('detects separator at column boundary', () => {
+    const metrics = createMockMetrics() as GridMetrics;
+    const x = 150; // At boundary between column 0 and 1 (100 + 50)
+    const y = 15; // In header area
 
-    // eslint-disable-next-line class-methods-use-this
-    get columnHeaderMaxDepth(): number {
-      return 2;
-    }
+    const headerGroups = new Map([
+      [
+        0,
+        new Map([
+          [0, 'A'],
+          [1, 'B'],
+          [2, 'C'],
+          [3, 'D'],
+        ]),
+      ],
+    ]);
+    const model = createMockGroupedGridModel(headerGroups);
 
-    // eslint-disable-next-line class-methods-use-this
-    textForCell(column: ModelIndex, row: ModelIndex): string {
-      return `${column},${row}`;
-    }
+    const result = GridUtils.getColumnSeparatorIndex(
+      x,
+      y,
+      metrics,
+      mockTheme,
+      model
+    );
 
-    textForColumnHeader(column: ModelIndex, depth = 0): string | undefined {
-      return this.headerGroups.get(depth)?.get(column);
-    }
-  }
+    expect(result).toBe(0);
+  });
 
-  it('detects separator at column boundary', () => {
+  it('detects there is no separator within the column', () => {
     const metrics = createMockMetrics() as GridMetrics;
-    const x = 150; // At boundary between column 0 and 1 (100 + 50)
+    const x = 120; // Within column 1
     const y = 15; // In header area
 
     const headerGroups = new Map([
@@ -1163,7 +1175,7 @@ describe('getColumnSeparatorIndex', () => {
         ]),
       ],
     ]);
-    const model = new MockGroupedGridModel(headerGroups);
+    const model = createMockGroupedGridModel(headerGroups);
 
     const result = GridUtils.getColumnSeparatorIndex(
       x,
@@ -1173,13 +1185,12 @@ describe('getColumnSeparatorIndex', () => {
       model
     );
 
-    expect(result).toBe(0);
+    expect(result).toBe(null);
   });
 
   it('should return null at depth 1 when no separator exists (columns in same group)', () => {
     // Depth 0 (base columns): A, B, C, D
     // Depth 1 (groups): Group1, Group1, Group2, Group2
-    // This is the core bug fix: hovering at group level where separator doesn't exist
     const headerGroups = new Map([
       [
         0,
@@ -1200,7 +1211,7 @@ describe('getColumnSeparatorIndex', () => {
         ]),
       ],
     ]);
-    const model = new MockGroupedGridModel(headerGroups);
+    const model = createMockGroupedGridModel(headerGroups);
     const metrics = createMockMetrics(2) as GridMetrics;
 
     const x = 150; // Between column 0 and 1
@@ -1214,7 +1225,7 @@ describe('getColumnSeparatorIndex', () => {
       model
     );
 
-    expect(result).toBeNull(); // No separator at depth 1 (both in Group1)
+    expect(result).toBeNull();
   });
 
   it('should detect separator at depth 1 when groups differ', () => {
@@ -1240,7 +1251,7 @@ describe('getColumnSeparatorIndex', () => {
         ]),
       ],
     ]);
-    const model = new MockGroupedGridModel(headerGroups);
+    const model = createMockGroupedGridModel(headerGroups);
     const metrics = createMockMetrics(2) as GridMetrics;
 
     const x = 250; // Between column 1 (Group1) and 2 (Group2)
@@ -1254,6 +1265,6 @@ describe('getColumnSeparatorIndex', () => {
       model
     );
 
-    expect(result).toBe(1); // Separator exists at depth 1 (Group1 vs Group2)
+    expect(result).toBe(1);
   });
 });