Updated TestUtils references (#2185)

deephaven · Sep 17, 2024 · 9c0d354 · 9c0d354
1 parent 40d5dc5
commit 9c0d354
Show file tree

Hide file tree

Showing 28 changed files with 75 additions and 23 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -59,6 +59,7 @@
   },
   "devDependencies": {
     "@deephaven/mocks": "file:../mocks",
+    "@deephaven/test-utils": "file:../test-utils",
     "react-redux": "^7.2.4"
   },
   "files": [

diff --git a/packages/components/src/ItemList.test.tsx b/packages/components/src/ItemList.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Range, TestUtils, ClickOptions } from '@deephaven/utils';
+import { Range } from '@deephaven/utils';
+import { ClickOptions, TestUtils } from '@deephaven/test-utils';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import ItemList from './ItemList';

diff --git a/packages/components/src/theme/ThemeProvider.test.tsx b/packages/components/src/theme/ThemeProvider.test.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { act, render } from '@testing-library/react';
-import { assertNotNull, TestUtils } from '@deephaven/utils';
+import { assertNotNull } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { ThemeContextValue, ThemeProvider } from './ThemeProvider';
 import { DEFAULT_LIGHT_THEME_KEY, ThemeData } from './ThemeModel';
 import {

diff --git a/packages/components/src/theme/ThemeUtils.test.ts b/packages/components/src/theme/ThemeUtils.test.ts
@@ -1,7 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { ColorUtils, TestUtils } from '@deephaven/utils';
+import { ColorUtils } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import {
   DEFAULT_DARK_THEME_KEY,
   DEFAULT_PRELOAD_DATA_VARIABLES,

diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
@@ -9,6 +9,7 @@
   "references": [
     { "path": "../log" },
     { "path": "../react-hooks" },
-    { "path": "../utils" }
+    { "path": "../utils" },
+    { "path": "../test-utils" }
   ]
 }
diff --git a/packages/iris-grid/package.json b/packages/iris-grid/package.json
@@ -67,6 +67,7 @@
   "devDependencies": {
     "@deephaven/jsapi-shim": "file:../jsapi-shim",
     "@deephaven/mocks": "file:../mocks",
+    "@deephaven/test-utils": "file:../test-utils",
     "deep-equal": "2.2.3"
   },
   "files": [

diff --git a/...ages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.test.tsx b/...ages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.test.tsx
@@ -3,7 +3,8 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { GridUtils } from '@deephaven/grid';
 import type { MoveOperation } from '@deephaven/grid';
-import { assertNotNull, TestUtils } from '@deephaven/utils';
+import { assertNotNull } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import dh from '@deephaven/jsapi-shim';
 import type { ColumnGroup } from '@deephaven/jsapi-types';
 import VisibilityOrderingBuilder from './VisibilityOrderingBuilder';

diff --git a/packages/iris-grid/tsconfig.json b/packages/iris-grid/tsconfig.json
@@ -17,6 +17,7 @@
     { "path": "../log" },
     { "path": "../react-hooks" },
     { "path": "../storage" },
-    { "path": "../utils" }
+    { "path": "../utils" },
+    { "path": "../test-utils" }
   ]
 }
diff --git a/packages/jsapi-components/package.json b/packages/jsapi-components/package.json
@@ -37,6 +37,7 @@
   },
   "devDependencies": {
     "@deephaven/jsapi-shim": "file:../jsapi-shim",
+    "@deephaven/test-utils": "file:../test-utils",
     "react-test-renderer": "^17.0.2"
   },
   "peerDependencies": {

diff --git a/packages/jsapi-components/src/useDebouncedViewportSelectionFilter.test.ts b/packages/jsapi-components/src/useDebouncedViewportSelectionFilter.test.ts
@@ -12,7 +12,8 @@ import {
   useMappedSelection,
   WindowedListData,
 } from '@deephaven/react-hooks';
-import { KeyedItem, TestUtils } from '@deephaven/utils';
+import { KeyedItem } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import useDebouncedViewportSelectionFilter, {
   DEBOUNCE_MS,
 } from './useDebouncedViewportSelectionFilter';

diff --git a/packages/jsapi-components/src/useFormatter.test.ts b/packages/jsapi-components/src/useFormatter.test.ts
@@ -1,5 +1,6 @@
 import { useApi } from '@deephaven/jsapi-bootstrap';
-import { bindAllMethods, TestUtils } from '@deephaven/utils';
+import { bindAllMethods } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import {
   createFormatterFromSettings,
   Formatter,

diff --git a/packages/jsapi-components/src/useInitializeViewportData.test.ts b/packages/jsapi-components/src/useInitializeViewportData.test.ts
@@ -2,7 +2,8 @@ import { act, renderHook } from '@testing-library/react-hooks';
 import type { dh } from '@deephaven/jsapi-types';
 import { generateEmptyKeyedItems } from '@deephaven/jsapi-utils';
 import { WindowedListData } from '@deephaven/react-hooks';
-import { ITEM_KEY_PREFIX, KeyedItem, TestUtils } from '@deephaven/utils';
+import { ITEM_KEY_PREFIX, KeyedItem } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import useInitializeViewportData from './useInitializeViewportData';
 import useTableSize from './useTableSize';
 

diff --git a/packages/jsapi-components/src/usePickerWithSelectedValues.test.ts b/packages/jsapi-components/src/usePickerWithSelectedValues.test.ts
@@ -11,7 +11,8 @@ import {
   useDebouncedValue,
   type WindowedListData,
 } from '@deephaven/react-hooks';
-import { KeyedItem, TestUtils } from '@deephaven/utils';
+import { KeyedItem } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import usePickerWithSelectedValues from './usePickerWithSelectedValues';
 import useViewportData, { UseViewportDataResult } from './useViewportData';
 import useViewportFilter from './useViewportFilter';

diff --git a/packages/jsapi-components/tsconfig.json b/packages/jsapi-components/tsconfig.json
@@ -11,6 +11,7 @@
     { "path": "../jsapi-bootstrap" },
     { "path": "../jsapi-shim" },
     { "path": "../jsapi-utils" },
-    { "path": "../log" }
+    { "path": "../log" },
+    { "path": "../test-utils" }
   ]
 }
diff --git a/packages/jsapi-utils/package.json b/packages/jsapi-utils/package.json
@@ -29,7 +29,8 @@
     "nanoid": "^5.0.7"
   },
   "devDependencies": {
-    "@deephaven/jsapi-shim": "file:../jsapi-shim"
+    "@deephaven/jsapi-shim": "file:../jsapi-shim",
+    "@deephaven/test-utils": "file:../test-utils"
   },
   "files": [
     "dist"

diff --git a/packages/jsapi-utils/src/FilterUtils.test.ts b/packages/jsapi-utils/src/FilterUtils.test.ts
@@ -1,7 +1,8 @@
 import { Key } from 'react';
 import dh from '@deephaven/jsapi-shim';
 import type { dh as DhType } from '@deephaven/jsapi-types';
-import { KeyedItem, TestUtils } from '@deephaven/utils';
+import { KeyedItem } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import {
   createComboboxFilterArgs,
   createFilterConditionFactory,

diff --git a/packages/jsapi-utils/src/TableUtils.test.ts b/packages/jsapi-utils/src/TableUtils.test.ts
@@ -6,7 +6,8 @@ import {
   Type as FilterType,
   TypeValue as FilterTypeValue,
 } from '@deephaven/filters';
-import { getAllMethodNames, TestUtils } from '@deephaven/utils';
+import { getAllMethodNames } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import TableUtils, { DataType, SortDirection } from './TableUtils';
 import DateUtils from './DateUtils';
 // eslint-disable-next-line import/no-relative-packages

diff --git a/packages/jsapi-utils/tsconfig.json b/packages/jsapi-utils/tsconfig.json
@@ -10,6 +10,7 @@
     { "path": "../filters" },
     { "path": "../jsapi-shim" },
     { "path": "../log" },
-    { "path": "../utils" }
+    { "path": "../utils" },
+    { "path": "../test-utils" }
   ]
 }
diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
@@ -28,6 +28,9 @@
     "lodash.throttle": "^4.1.1",
     "nanoid": "^5.0.7"
   },
+  "devDependencies": {
+    "@deephaven/test-utils": "file:../test-utils"
+  },
   "peerDependencies": {
     "react": ">=16.8.0"
   },

diff --git a/packages/react-hooks/src/SpectrumUtils.test.ts b/packages/react-hooks/src/SpectrumUtils.test.ts
@@ -1,4 +1,5 @@
-import { KeyedItem, TestUtils } from '@deephaven/utils';
+import { KeyedItem } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import type { DOMRefValue } from '@react-types/shared';
 import {
   createValidationProps,

diff --git a/packages/react-hooks/src/useMappedSelection.test.ts b/packages/react-hooks/src/useMappedSelection.test.ts
@@ -1,6 +1,7 @@
 import { Key } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
-import { KeyedItem, TestUtils } from '@deephaven/utils';
+import { KeyedItem } from '@deephaven/utils';
+import { TestUtils } from '@deephaven/test-utils';
 import { useMappedSelection } from './useMappedSelection';
 import { WindowedListData } from './useWindowedListData';
 import { mapSelection, optimizeSelection } from './SelectionUtils';

diff --git a/packages/react-hooks/tsconfig.json b/packages/react-hooks/tsconfig.json
@@ -6,5 +6,9 @@
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.js", "src/**/*.jsx"],
   "exclude": ["node_modules", "src/**/*.test.*", "src/**/__mocks__/*"],
-  "references": [{ "path": "../log" }, { "path": "../utils" }]
+  "references": [
+    { "path": "../log" },
+    { "path": "../utils" },
+    { "path": "../test-utils" }
+  ]
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -27,5 +27,8 @@
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "@deephaven/test-utils": "file:../test-utils"
   }
 }
diff --git a/packages/utils/src/ColorUtils.test.ts b/packages/utils/src/ColorUtils.test.ts
@@ -1,5 +1,5 @@
+import { TestUtils } from '@deephaven/test-utils';
 import ColorUtils from './ColorUtils';
-import TestUtils from './TestUtils';
 
 const { createMockProxy } = TestUtils;
 

diff --git a/packages/utils/src/DOMUtils.test.ts b/packages/utils/src/DOMUtils.test.ts
@@ -1,9 +1,9 @@
+import { TestUtils } from '@deephaven/test-utils';
 import {
   getClosestByClassName,
   identityExtractHTMLElement,
   syncAnimationStartTime,
 } from './DOMUtils';
-import TestUtils from './TestUtils';
 
 const { createMockProxy } = TestUtils;
 

diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
@@ -5,5 +5,6 @@
     "outDir": "dist/"
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.js", "src/**/*.jsx"],
-  "exclude": ["node_modules", "src/**/*.test.*", "src/**/__mocks__/*"]
+  "exclude": ["node_modules", "src/**/*.test.*", "src/**/__mocks__/*"],
+  "references": [{ "path": "../test-utils" }]
 }
diff --git a/unit-errors.json b/unit-errors.json