test: update test case and fix inversify

xile611 · xile611 · commit e3b45a815f1b · 2026-01-14T11:21:21.000+08:00
diff --git a/packages/vrender-components/__tests__/browser/examples/axis-autoWrap.ts b/packages/vrender-components/__tests__/browser/examples/axis-autoWrap.ts
@@ -1,6 +1,6 @@
 import { createStage } from '@visactor/vrender-core';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 import render from '../../util/render';
 import { LineAxis } from '../../../src';
 
diff --git a/packages/vrender-components/__tests__/browser/examples/axis-label-limit.ts b/packages/vrender-components/__tests__/browser/examples/axis-label-limit.ts
@@ -1,6 +1,6 @@
 import { createStage } from '@visactor/vrender-core';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 import { PointScale } from '@visactor/vscale';
 import { LineAxis } from '../../../src';
 
diff --git a/packages/vrender-components/__tests__/browser/examples/axis-labels.ts b/packages/vrender-components/__tests__/browser/examples/axis-labels.ts
@@ -1,6 +1,6 @@
 import { createStage } from '@visactor/vrender-core';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 import render from '../../util/render';
 import { LineAxis } from '../../../src';
 
diff --git a/packages/vrender-components/__tests__/browser/examples/poptip.ts b/packages/vrender-components/__tests__/browser/examples/poptip.ts
@@ -8,8 +8,8 @@ import { registerAnimate, registerCustomAnimate } from '@visactor/vrender-animat
 registerAnimate();
 registerCustomAnimate();
 
-// import { initBrowserEnv } from '@visactor/vrender-kits';
-// initBrowserEnv();
+// import { loadBrowserEnv } from '@visactor/vrender-kits';
+// loadBrowserEnv();
 loadPoptip();
 
 export function run() {
diff --git a/packages/vrender-components/__tests__/unit/axis/circle.test.ts b/packages/vrender-components/__tests__/unit/axis/circle.test.ts
@@ -5,8 +5,8 @@ import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
 import type { Tag } from '../../../src/tag/tag';
 import { AXIS_ELEMENT_NAME } from '../../../src/axis/constant';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Circle Axis', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/axis/line.test.ts b/packages/vrender-components/__tests__/unit/axis/line.test.ts
@@ -5,8 +5,8 @@ import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
 import { AXIS_ELEMENT_NAME } from '../../../src/axis/constant';
 import { Tag } from './../../../src/tag/tag';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Line Axis', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/axis/overlap/auto-limit.test.ts b/packages/vrender-components/__tests__/unit/axis/overlap/auto-limit.test.ts
@@ -3,8 +3,8 @@ import { LineAxis } from '../../../../src';
 import { createCanvas } from '../../../util/dom';
 import { createStage } from '../../../util/vrender';
 import { AXIS_ELEMENT_NAME } from '../../../../src/axis/constant';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Auto Limit', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/bugfix/legend-focus-layout.test.ts b/packages/vrender-components/__tests__/unit/bugfix/legend-focus-layout.test.ts
@@ -2,8 +2,8 @@ import type { IGraphic, ISymbol, Stage } from '@visactor/vrender-core';
 import { DiscreteLegend, LEGEND_ELEMENT_NAME } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Legend focus layout', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/crosshair.test.ts b/packages/vrender-components/__tests__/unit/crosshair.test.ts
@@ -3,8 +3,8 @@ import type { IGraphic, Stage, Arc, Path, Rect } from '@visactor/vrender-core';
 import { LineCrosshair, CircleCrosshair, PolygonCrosshair, RectCrosshair, SectorCrosshair, Tag } from '../../src';
 import { createCanvas } from '../util/dom';
 import { createStage } from '../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Crosshair', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/data-zoom.test.ts b/packages/vrender-components/__tests__/unit/data-zoom.test.ts
@@ -4,8 +4,8 @@ import type { Tag } from '../../src';
 import { DataZoom } from '../../src';
 import { createCanvas } from '../util/dom';
 import { createStage } from '../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('DataZoom component test', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/legend/discrete.test.ts b/packages/vrender-components/__tests__/unit/legend/discrete.test.ts
@@ -2,8 +2,8 @@ import type { IGraphic, IGroup, IText, Stage } from '@visactor/vrender-core';
 import { DiscreteLegend } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('DiscreteLegend', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/marker/arc-area.test.ts b/packages/vrender-components/__tests__/unit/marker/arc-area.test.ts
@@ -3,8 +3,8 @@ import type { Tag } from '../../../src';
 import { MarkArcArea } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Marker', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/marker/arc-line.test.ts b/packages/vrender-components/__tests__/unit/marker/arc-line.test.ts
@@ -5,8 +5,8 @@ import type { ArcSegment, Tag } from '../../../src';
 import { MarkArcLine } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Marker', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/marker/area.test.ts b/packages/vrender-components/__tests__/unit/marker/area.test.ts
@@ -3,8 +3,8 @@ import type { Tag } from '../../../src';
 import { MarkArea } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Marker', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/marker/line.test.ts b/packages/vrender-components/__tests__/unit/marker/line.test.ts
@@ -4,8 +4,8 @@ import type { Tag, Segment } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
 import { MarkLine } from '../../../src/marker/line';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Marker', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/marker/point.test.ts b/packages/vrender-components/__tests__/unit/marker/point.test.ts
@@ -3,8 +3,8 @@ import type { Tag, Segment } from '../../../src';
 import { MarkPoint } from '../../../src';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Marker', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/pager.test.ts b/packages/vrender-components/__tests__/unit/pager.test.ts
@@ -2,8 +2,8 @@ import type { IGraphic, Stage, ISymbol } from '@visactor/vrender-core';
 import { Pager } from '../../src';
 import { createCanvas } from '../util/dom';
 import { createStage } from '../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Pager', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/player/controller.test.ts b/packages/vrender-components/__tests__/unit/player/controller.test.ts
@@ -1,10 +1,10 @@
 import type { IGraphic, Stage } from '@visactor/vrender-core';
 import { createCanvas } from '../../util/dom';
 import { createStage } from '../../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
+import { loadBrowserEnv } from '@visactor/vrender-kits';
 import { Controller } from '../../../src/player/controller';
 import { ControllerEventEnum, ControllerTypeEnum } from '../../../src/player/controller/constant';
-initBrowserEnv();
+loadBrowserEnv();
 
 describe('PlayerController', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/segment.test.ts b/packages/vrender-components/__tests__/unit/segment.test.ts
@@ -2,8 +2,8 @@ import type { IGraphic, ILine, ILineGraphicAttribute, Stage } from '@visactor/vr
 import { Segment } from '../../src';
 import { createCanvas } from '../util/dom';
 import { createStage } from '../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Segment', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/slider.test.ts b/packages/vrender-components/__tests__/unit/slider.test.ts
@@ -7,8 +7,8 @@ import type { IGraphic, Stage, ISymbol, IGroup, IRect, IText } from '@visactor/v
 import { Slider, SLIDER_ELEMENT_NAME } from '../../src';
 import { createCanvas } from '../util/dom';
 import { createStage } from '../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Slider', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/unit/tag.test.ts b/packages/vrender-components/__tests__/unit/tag.test.ts
@@ -2,8 +2,8 @@ import type { IGraphic, Stage, IRect } from '@visactor/vrender-core';
 import { Tag } from '../../src';
 import { createCanvas } from '../util/dom';
 import { createStage } from '../util/vrender';
-import { initBrowserEnv } from '@visactor/vrender-kits';
-initBrowserEnv();
+import { loadBrowserEnv } from '@visactor/vrender-kits';
+loadBrowserEnv();
 
 describe('Tag', () => {
   let stage: Stage;
diff --git a/packages/vrender-components/__tests__/util/render.ts b/packages/vrender-components/__tests__/util/render.ts
@@ -3,9 +3,9 @@ import type { IGraphic, IStageParams } from '@visactor/vrender-core';
 import { Group, Line, Text, createStage, Symbol, Rect, Path, Arc, Area, Circle, Polygon } from '@visactor/vrender-core';
 
 import { array } from '@visactor/vutils';
-import { initBrowserEnv } from '@visactor/vrender-kits';
+import { loadBrowserEnv } from '@visactor/vrender-kits';
 import { loadScrollbar } from '../../src';
-initBrowserEnv();
+loadBrowserEnv();
 
 loadScrollbar();
 
diff --git a/packages/vrender-components/setup-mock.js b/packages/vrender-components/setup-mock.js
@@ -18,53 +18,8 @@ const {
   Pyramid3d,
   WrapText,
   graphicCreator,
-  arcModule,
-  container,
-  rectModule,
-  lineModule,
-  areaModule,
-  symbolModule,
-  textModule,
-  circleModule,
-  pathModule,
-  richtextModule,
-  polygonModule,
-  isBrowserEnv,
-  imageModule,
-  glyphModule,
-  rect3dModule,
-  arc3dModule,
-  pyramid3dModule
+  isBrowserEnv
 } = require('@visactor/vrender-core');
-const {
-  arc3dCanvasPickModule,
-  arcCanvasPickModule,
-  arcMathPickModule,
-  areaCanvasPickModule,
-  areaMathPickModule,
-  circleCanvasPickModule,
-  circleMathPickModule,
-  glyphCanvasPickModule,
-  glyphMathPickModule,
-  imageCanvasPickModule,
-  imageMathPickModule,
-  lineCanvasPickModule,
-  lineMathPickModule,
-  pathCanvasPickModule,
-  pathMathPickModule,
-  polygonCanvasPickModule,
-  polygonMathPickModule,
-  pyramid3dCanvasPickModule,
-  rect3dCanvasPickModule,
-  rectCanvasPickModule,
-  rectMathPickModule,
-  richTextMathPickModule,
-  richtextCanvasPickModule,
-  symbolCanvasPickModule,
-  symbolMathPickModule,
-  textCanvasPickModule,
-  textMathPickModule
-} = require('@visactor/vrender-kits');
 
 global.__DEV__ = true;
 global.__VERSION__ = true;
@@ -147,50 +102,3 @@ const obj = {
 Object.keys(obj).forEach(k => {
   graphicCreator.RegisterGraphicCreator(k, obj[k]);
 });
-
-const browser = isBrowserEnv();
-
-container.load(arcModule);
-container.load(browser ? arcCanvasPickModule : arcMathPickModule);
-
-container.load(rectModule);
-container.load(browser ? rectCanvasPickModule : rectMathPickModule);
-
-container.load(lineModule);
-container.load(browser ? lineCanvasPickModule : lineMathPickModule);
-
-container.load(areaModule);
-container.load(browser ? areaCanvasPickModule : areaMathPickModule);
-
-container.load(symbolModule);
-container.load(browser ? symbolCanvasPickModule : symbolMathPickModule);
-
-container.load(textModule);
-container.load(browser ? textCanvasPickModule : textMathPickModule);
-
-container.load(circleModule);
-container.load(browser ? circleCanvasPickModule : circleMathPickModule);
-
-container.load(pathModule);
-container.load(browser ? pathCanvasPickModule : pathMathPickModule);
-
-container.load(richtextModule);
-container.load(browser ? richtextCanvasPickModule : richTextMathPickModule);
-
-container.load(polygonModule);
-container.load(browser ? polygonCanvasPickModule : polygonMathPickModule);
-
-container.load(imageModule);
-container.load(browser ? imageCanvasPickModule : imageMathPickModule);
-
-container.load(glyphModule);
-container.load(browser ? glyphCanvasPickModule : glyphMathPickModule);
-
-container.load(rect3dModule);
-container.load(browser ? rect3dCanvasPickModule : rect3dCanvasPickModule);
-
-container.load(arc3dModule);
-container.load(browser ? arc3dCanvasPickModule : arc3dCanvasPickModule);
-
-container.load(pyramid3dModule);
-container.load(browser ? pyramid3dCanvasPickModule : pyramid3dCanvasPickModule);
diff --git a/packages/vrender-core/src/index.ts b/packages/vrender-core/src/index.ts
@@ -59,6 +59,7 @@ export * from './constants';
 export * from './env-check';
 export * from './common/registry'; // 导出 registry
 export { vglobal, graphicService, graphicUtil, transformUtil, layerService } from './modules'; // 导出全局服务
+export { serviceRegistry, contributionRegistry } from './common/registry'; // 导出注册表以供测试使用
 
 export * from './register/register-arc';
 export * from './register/register-arc3d';
