Skip to content

Commit aab51d7

Browse files
xile611xile611
committed
test: update test case about getTheme 
1 parent 6e64679 commit aab51d7

12 files changed

+95
-71
lines changed

‎packages/vchart/__tests__/unit/chart/bar.test.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { GlobalScale } from '../../../src/scale/global-scale';
22
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
33
// @ts-nocheck
44
import { EventDispatcher } from '../../../src/event/event-dispatcher';
5-
import type { BarSeries, IChartSpec } from '../../../src';
5+
import type { BarSeries } from '../../../src';
66
// eslint-disable-next-line no-duplicate-imports
7-
import { BarChart, ThemeManager } from '../../../src';
7+
import { BarChart } from '../../../src';
88
import { DataSet } from '@visactor/vdataset';
99
import { createCanvas, removeDom } from '../../util/dom';
10-
import { initChartDataSet } from '../../util/context';
10+
import { getTheme, initChartDataSet } from '../../util/context';
1111
import { getTestCompiler } from '../../util/factory/compiler';
1212

1313
// 保证引入执行 Build-in
@@ -92,7 +92,7 @@ describe('Bar chart test', () => {
9292
const transformer = new BarChart.transformerConstructor({
9393
type: 'bar',
9494
seriesType: 'bar',
95-
getTheme: () => ThemeManager.getCurrentTheme(true),
95+
getTheme: getTheme,
9696
mode: 'desktop-browser'
9797
});
9898
const info = transformer.initChartSpec(spec as any);
@@ -113,7 +113,7 @@ describe('Bar chart test', () => {
113113
mode: 'desktop-browser',
114114
getCompiler: getTestCompiler,
115115
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
116-
getTheme: () => ThemeManager.getCurrentTheme(true),
116+
getTheme: getTheme,
117117
getSpecInfo: () => info
118118
} as any
119119
);

‎packages/vchart/__tests__/unit/chart/histogram.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { EventDispatcher } from '../../../src/event/event-dispatcher';
22
import type { BarSeries } from '../../../src';
33
// eslint-disable-next-line no-duplicate-imports
4-
import { HistogramChart, ThemeManager } from '../../../src';
4+
import { HistogramChart } from '../../../src';
55
import { DataSet, DataView, csvParser } from '@visactor/vdataset';
66
import { createCanvas, removeDom } from '../../util/dom';
77
import { getTestCompiler } from '../../util/factory/compiler';
88
import { GlobalScale } from '../../../src/scale/global-scale';
9-
import { initChartDataSet } from '../../util/context';
9+
import { getTheme, initChartDataSet } from '../../util/context';
1010

1111
// 保证引入执行 Build-in
1212
const dataSet = new DataSet();
@@ -53,7 +53,7 @@ describe('histogram chart test', () => {
5353
const transformer = new HistogramChart.transformerConstructor({
5454
type: 'histogram',
5555
seriesType: 'bar',
56-
getTheme: () => ThemeManager.getCurrentTheme(true),
56+
getTheme: getTheme,
5757
mode: 'desktop-browser'
5858
});
5959
const info = transformer.initChartSpec(spec as any);
@@ -71,7 +71,7 @@ describe('histogram chart test', () => {
7171
mode: 'desktop-browser',
7272
getCompiler: getTestCompiler,
7373
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
74-
getTheme: () => ThemeManager.getCurrentTheme(true),
74+
getTheme: getTheme,
7575
getSpecInfo: () => info
7676
} as any
7777
);

‎packages/vchart/__tests__/unit/chart/line.test.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import type { ILineChartSpec } from '../../../src/chart/line/interface';
22
import { GlobalScale } from '../../../src/scale/global-scale';
33
import type { LineSeries } from '../../../src/series/line/line';
44
import { DataSet, DataView, csvParser } from '@visactor/vdataset';
5-
import { LineChart } from '../../../src/chart/line/line';
5+
import { LineChart, registerLineChart } from '../../../src/chart/line/line';
66
import { EventDispatcher } from '../../../src/event/event-dispatcher';
77
import { getTestCompiler } from '../../util/factory/compiler';
8-
import { initChartDataSet } from '../../util/context';
9-
import VChart, { ThemeManager } from '../../../src';
8+
import { getTheme, initChartDataSet } from '../../util/context';
109

10+
registerLineChart();
1111
const dataSet = new DataSet();
1212
initChartDataSet(dataSet);
1313
dataSet.registerParser('csv', csvParser);
@@ -34,7 +34,7 @@ describe('line chart test', () => {
3434
const transformer = new LineChart.transformerConstructor({
3535
type: 'line',
3636
seriesType: 'line',
37-
getTheme: () => ThemeManager.getCurrentTheme(true),
37+
getTheme: getTheme,
3838
mode: 'desktop-browser'
3939
});
4040
const info = transformer.initChartSpec(spec as any);
@@ -55,7 +55,7 @@ describe('line chart test', () => {
5555
mode: 'desktop-browser',
5656
getCompiler: getTestCompiler,
5757
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
58-
getTheme: () => ThemeManager.getCurrentTheme(true),
58+
getTheme: getTheme,
5959
onError: () => {},
6060
getSpecInfo: () => info
6161
} as any
@@ -103,7 +103,7 @@ describe('line chart test', () => {
103103
const transformer = new LineChart.transformerConstructor({
104104
type: 'line',
105105
seriesType: 'line',
106-
getTheme: () => ThemeManager.getCurrentTheme(true),
106+
getTheme: getTheme,
107107
mode: 'desktop-browser'
108108
});
109109
const info = transformer.initChartSpec(spec as any);
@@ -122,7 +122,7 @@ describe('line chart test', () => {
122122
mode: 'mobile-browser',
123123
getCompiler: getTestCompiler,
124124
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
125-
getTheme: () => ThemeManager.getCurrentTheme(true),
125+
getTheme: getTheme,
126126
getSpecInfo: () => info
127127
} as any);
128128
chart.created(transformer);

‎packages/vchart/__tests__/unit/chart/linearProgress.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { DataSet, csvParser } from '@visactor/vdataset';
22
import { EventDispatcher } from '../../../src/event/event-dispatcher';
33
import type { LinearProgressSeries } from '../../../src';
44
// eslint-disable-next-line no-duplicate-imports
5-
import { LinearProgressChart, ThemeManager } from '../../../src';
5+
import { LinearProgressChart } from '../../../src';
66
import { getTestCompiler } from '../../util/factory/compiler';
77
import { GlobalScale } from '../../../src/scale/global-scale';
8-
import { initChartDataSet } from '../../util/context';
8+
import { getTheme, initChartDataSet } from '../../util/context';
99

1010
// 保证引入执行 Build-in
1111
const dataSet = new DataSet();
@@ -41,7 +41,7 @@ describe('linearProgress chart test', () => {
4141
const transformer = new LinearProgressChart.transformerConstructor({
4242
type: 'linearProgress',
4343
seriesType: 'linearProgress',
44-
getTheme: () => ThemeManager.getCurrentTheme(true),
44+
getTheme: getTheme,
4545
mode: 'desktop-browser'
4646
});
4747
const info = transformer.initChartSpec(spec as any);
@@ -59,7 +59,7 @@ describe('linearProgress chart test', () => {
5959
mode: 'desktop-browser',
6060
getCompiler: getTestCompiler,
6161
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
62-
getTheme: () => ThemeManager.getCurrentTheme(true),
62+
getTheme: getTheme,
6363
animation: false,
6464
getSpecInfo: () => info
6565
} as any

‎packages/vchart/__tests__/unit/chart/rangeColumn.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { DataSet, DataView, csvParser } from '@visactor/vdataset';
2-
import { RangeColumnChart, ThemeManager } from '../../../src';
2+
import { RangeColumnChart } from '../../../src';
33
import type { RangeColumnSeries } from '../../../src/series/range-column/range-column';
44
import { EventDispatcher } from '../../../src/event/event-dispatcher';
55
import { getTestCompiler } from '../../util/factory/compiler';
66
import { GlobalScale } from '../../../src/scale/global-scale';
7-
import { initChartDataSet } from '../../util/context';
7+
import { getTheme, initChartDataSet } from '../../util/context';
88

99
// 保证引入执行 Build-in
1010
const dataSet = new DataSet();
@@ -51,7 +51,7 @@ describe('rangeColumn chart test', () => {
5151
const transformer = new RangeColumnChart.transformerConstructor({
5252
type: 'rangeColumn',
5353
seriesType: 'rangeColumn',
54-
getTheme: () => ThemeManager.getCurrentTheme(true),
54+
getTheme: getTheme,
5555
mode: 'desktop-browser'
5656
});
5757
const info = transformer.initChartSpec(spec as any);
@@ -72,7 +72,7 @@ describe('rangeColumn chart test', () => {
7272
mode: 'desktop-browser',
7373
getCompiler: getTestCompiler,
7474
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
75-
getTheme: () => ThemeManager.getCurrentTheme(true),
75+
getTheme: getTheme,
7676
animation: false,
7777
getSpecInfo: () => info
7878
} as any

‎packages/vchart/__tests__/unit/chart/treemap.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { GlobalScale } from '../../../src/scale/global-scale';
22
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
33
// @ts-nocheck
44
import { EventDispatcher } from '../../../src/event/event-dispatcher';
5-
import { ThemeManager, default as VChart } from '../../../src';
5+
import { default as VChart } from '../../../src';
66
import { DataSet, csvParser } from '@visactor/vdataset';
77
import { createCanvas, removeDom } from '../../util/dom';
88
import { getTestCompiler } from '../../util/factory/compiler';
@@ -12,7 +12,7 @@ import type { ITreemapChartSpec } from '../../../src/chart/treemap';
1212
import { TreemapChart } from '../../../src/chart/treemap';
1313
import type { TreemapSeries } from '../../../src/series/treemap/treemap';
1414
import { DEFAULT_HIERARCHY_DEPTH } from '../../../src/constant/hierarchy';
15-
import { initChartDataSet } from '../../util/context';
15+
import { getTheme, initChartDataSet } from '../../util/context';
1616

1717
// 保证引入执行 Build-in
1818
const dataSet = new DataSet();
@@ -54,7 +54,7 @@ describe('treemap chart test', () => {
5454
const transformer = new TreemapChart.transformerConstructor({
5555
type: 'treemap',
5656
seriesType: 'treemap',
57-
getTheme: () => ThemeManager.getCurrentTheme(true),
57+
getTheme: getTheme,
5858
mode: 'desktop-browser'
5959
});
6060
const info = transformer.initChartSpec(spec as any);
@@ -75,7 +75,7 @@ describe('treemap chart test', () => {
7575
mode: 'desktop-browser',
7676
getCompiler: getTestCompiler,
7777
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
78-
getTheme: () => ThemeManager.getCurrentTheme(true),
78+
getTheme: getTheme,
7979
onError: () => {},
8080
getSpecInfo: () => info
8181
} as any

‎packages/vchart/__tests__/unit/chart/word-cloud.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import { GlobalScale } from '../../../src/scale/global-scale';
44
import { EventDispatcher } from '../../../src/event/event-dispatcher';
55
import type { IWordCloudChartSpec } from '../../../src';
66
// eslint-disable-next-line no-duplicate-imports
7-
import { ThemeManager, default as VChart } from '../../../src';
7+
import { default as VChart } from '../../../src';
88
import { DataSet, csvParser } from '@visactor/vdataset';
99
import { WordCloudChart } from '../../../src/chart/word-cloud/word-cloud';
1010
import type { WordCloudSeries } from '../../../src/series/word-cloud/word-cloud';
1111
import { dataWordCloud } from '../../data/data-wordcloud';
1212
import { createCanvas, removeDom } from '../../util/dom';
1313
import { getTestCompiler } from '../../util/factory/compiler';
14-
import { initChartDataSet } from '../../util/context';
14+
import { getTheme, initChartDataSet } from '../../util/context';
1515

1616
// 保证引入执行 Build-in
1717
const dataSet = new DataSet();
@@ -62,7 +62,7 @@ describe('wordCloud chart test', () => {
6262
const transformer = new WordCloudChart.transformerConstructor({
6363
type: 'wordCloud',
6464
seriesType: 'wordCloud',
65-
getTheme: () => ThemeManager.getCurrentTheme(true),
65+
getTheme: getTheme,
6666
mode: 'desktop-browser'
6767
});
6868
const info = transformer.initChartSpec(spec);
@@ -81,7 +81,7 @@ describe('wordCloud chart test', () => {
8181
mode: 'desktop-browser',
8282
getCompiler: getTestCompiler,
8383
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
84-
getTheme: () => ThemeManager.getCurrentTheme(true),
84+
getTheme: getTheme,
8585
getSpecInfo: () => info
8686
} as any);
8787
chart.created(transformer);

‎packages/vchart/__tests__/unit/component/cartesian/axis/linear-axis.test.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { DataSet, csvParser } from '@visactor/vdataset';
66
import { dimensionStatistics } from '../../../../../src/data/transforms/dimension-statistics';
77
import type { CartesianLinearAxis } from '../../../../../src/index';
88
// eslint-disable-next-line no-duplicate-imports
9-
import { CartesianAxis, ThemeManager } from '../../../../../src/index';
9+
import { CartesianAxis } from '../../../../../src/index';
1010
import { ComponentTypeEnum, type IComponent, type IComponentOption } from '../../../../../src/component/interface';
1111
import { EventDispatcher } from '../../../../../src/event/event-dispatcher';
1212
import { getTestCompiler } from '../../../../util/factory/compiler';
13-
import { initChartDataSet } from '../../../../util/context';
13+
import { getTheme, initChartDataSet } from '../../../../util/context';
1414
import type { StringOrNumber } from '../../../../../src/typings/common';
1515
import { getCartesianAxisInfo } from '../../../../../src/component/axis/cartesian/util';
1616
import { wilkinsonExtended } from '@visactor/vscale';
@@ -97,7 +97,7 @@ const ctx: IComponentOption = {
9797
return { width: 500, height: 500 } as any;
9898
},
9999
globalScale: new GlobalScale([], { getAllSeries: () => [] as any[] } as any),
100-
getTheme: () => ThemeManager.getCurrentTheme(true),
100+
getTheme: getTheme,
101101
getComponentByUserId: function (user_id: string | number): IComponent | undefined {
102102
throw new Error('Function not implemented.');
103103
},
@@ -131,7 +131,7 @@ test('config linearAxis.nice default [true] ', () => {
131131
});
132132
const transformer = new CartesianAxis.transformerConstructor({
133133
type: 'cartesianAxis-linear',
134-
getTheme: () => ThemeManager.getCurrentTheme(true),
134+
getTheme: getTheme,
135135
mode: 'desktop-browser'
136136
});
137137
spec = transformer.transformSpec(spec, {}).spec;
@@ -158,7 +158,7 @@ test('config linearAxis.nice default [true] ', () => {
158158
});
159159
const transformer = new CartesianAxis.transformerConstructor({
160160
type: 'cartesianAxis-linear',
161-
getTheme: () => ThemeManager.getCurrentTheme(true),
161+
getTheme: getTheme,
162162
mode: 'desktop-browser'
163163
});
164164
spec = transformer.transformSpec(spec, {}).spec;
@@ -185,7 +185,7 @@ test('nice === false ', () => {
185185
});
186186
const transformer = new CartesianAxis.transformerConstructor({
187187
type: 'cartesianAxis-linear',
188-
getTheme: () => ThemeManager.getCurrentTheme(true),
188+
getTheme: getTheme,
189189
mode: 'desktop-browser'
190190
});
191191
spec = transformer.transformSpec(spec, {}).spec;
@@ -213,7 +213,7 @@ test('zero === false && nice === false ', () => {
213213
});
214214
const transformer = new CartesianAxis.transformerConstructor({
215215
type: 'cartesianAxis-linear',
216-
getTheme: () => ThemeManager.getCurrentTheme(true),
216+
getTheme: getTheme,
217217
mode: 'desktop-browser'
218218
});
219219
spec = transformer.transformSpec(spec, {}).spec;
@@ -243,7 +243,7 @@ test('zero === true && range is specific ', () => {
243243
});
244244
const transformer = new CartesianAxis.transformerConstructor({
245245
type: 'cartesianAxis-linear',
246-
getTheme: () => ThemeManager.getCurrentTheme(true),
246+
getTheme: getTheme,
247247
mode: 'desktop-browser'
248248
});
249249
config = transformer.transformSpec(config, {}).spec;
@@ -343,7 +343,7 @@ test('expand', () => {
343343
});
344344
const transformer = new CartesianAxis.transformerConstructor({
345345
type: 'cartesianAxis-linear',
346-
getTheme: () => ThemeManager.getCurrentTheme(true),
346+
getTheme: getTheme,
347347
mode: 'desktop-browser'
348348
});
349349
config = transformer.transformSpec(config, {}).spec;
@@ -420,7 +420,7 @@ test('extend', () => {
420420
});
421421
const transformer = new CartesianAxis.transformerConstructor({
422422
type: 'cartesianAxis-linear',
423-
getTheme: () => ThemeManager.getCurrentTheme(true),
423+
getTheme: getTheme,
424424
mode: 'desktop-browser'
425425
});
426426
config = transformer.transformSpec(config, {}).spec;
@@ -475,7 +475,7 @@ test('niceDomain should work when domain is 0, and user does not set min or max'
475475
});
476476
const transformer = new CartesianAxis.transformerConstructor({
477477
type: 'cartesianAxis-linear',
478-
getTheme: () => ThemeManager.getCurrentTheme(true),
478+
getTheme: getTheme,
479479
mode: 'desktop-browser'
480480
});
481481
spec = transformer.transformSpec(spec, {}).spec;
@@ -507,7 +507,7 @@ test('niceDomain should not work when user set min or max', () => {
507507
});
508508
const transformer = new CartesianAxis.transformerConstructor({
509509
type: 'cartesianAxis-linear',
510-
getTheme: () => ThemeManager.getCurrentTheme(true),
510+
getTheme: getTheme,
511511
mode: 'desktop-browser'
512512
});
513513
spec = transformer.transformSpec(spec, {}).spec;
@@ -542,7 +542,7 @@ test('dynamic tickCount', () => {
542542
});
543543
const transformer = new CartesianAxis.transformerConstructor({
544544
type: 'cartesianAxis-linear',
545-
getTheme: () => ThemeManager.getCurrentTheme(true),
545+
getTheme: getTheme,
546546
mode: 'desktop-browser'
547547
});
548548
spec = transformer.transformSpec(spec, {}).spec;
@@ -600,7 +600,7 @@ test('dynamic tickCount', () => {
600600
});
601601
const transformer = new CartesianAxis.transformerConstructor({
602602
type: 'cartesianAxis-linear',
603-
getTheme: () => ThemeManager.getCurrentTheme(true),
603+
getTheme: getTheme,
604604
mode: 'desktop-browser'
605605
});
606606
spec = transformer.transformSpec(spec, {}).spec;
@@ -641,7 +641,7 @@ test('dynamic tickCount with wilkson', () => {
641641
});
642642
const transformer = new CartesianAxis.transformerConstructor({
643643
type: 'cartesianAxis-linear',
644-
getTheme: () => ThemeManager.getCurrentTheme(true),
644+
getTheme: getTheme,
645645
mode: 'desktop-browser'
646646
});
647647
spec = transformer.transformSpec(spec, {}).spec;

0 commit comments

Comments
 (0)