You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2021/01/03 12:46:43 UTC
[incubator-echarts] 01/02: ts: fix ut type since getModel set to
private.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch fix/legend-auto
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b6ce1907214d887af35f4b7b4d1e0dfe4884b666
Author: 100pah <su...@gmail.com>
AuthorDate: Wed Dec 23 16:43:14 2020 +0800
ts: fix ut type since getModel set to private.
---
test/ut/core/utHelper.ts | 7 ++++++-
test/ut/spec/component/dataZoom/helper.test.ts | 22 +++++++++++-----------
test/ut/spec/component/graphic/setOption.test.ts | 6 +++---
test/ut/spec/component/visualMap/setOption.test.ts | 4 ++--
test/ut/spec/model/Global.test.ts | 12 ++++++------
test/ut/spec/model/timelineMediaOptions.test.ts | 12 ++++++------
test/ut/spec/scale/interval.test.ts | 6 +++---
7 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/test/ut/core/utHelper.ts b/test/ut/core/utHelper.ts
index bfedb65..ae23689 100755
--- a/test/ut/core/utHelper.ts
+++ b/test/ut/core/utHelper.ts
@@ -27,6 +27,7 @@ import {
import { ComponentMainType } from '../../../src/util/types';
import Group from 'zrender/src/graphic/Group';
import Element from 'zrender/src/Element';
+import GlobalModel from '../../../src/model/Global';
export function createChart(params?: {
@@ -137,9 +138,13 @@ export function getViewGroup(
mainType: ComponentMainType,
index?: number
): Group {
- const component = chart.getModel().getComponent(mainType, index);
+ const component = getECModel(chart).getComponent(mainType, index);
return component ? chart[
mainType === 'series' ? '_chartsMap' : '_componentsMap'
][component.__viewId].group : null;
}
+export function getECModel(chart: EChartsType): GlobalModel {
+ // @ts-ignore
+ return chart.getModel();
+}
diff --git a/test/ut/spec/component/dataZoom/helper.test.ts b/test/ut/spec/component/dataZoom/helper.test.ts
index f51da55..905ae2c 100755
--- a/test/ut/spec/component/dataZoom/helper.test.ts
+++ b/test/ut/spec/component/dataZoom/helper.test.ts
@@ -19,7 +19,7 @@
*/
import { findEffectedDataZooms } from '../../../../../src/component/dataZoom/helper';
-import { createChart } from '../../../core/utHelper';
+import { createChart, getECModel } from '../../../core/utHelper';
import { EChartsType } from '../../../../../src/echarts';
@@ -50,12 +50,12 @@ describe('dataZoom/helper', function () {
});
const payload = { type: 'dataZoom', dataZoomIndex: 0 };
- const dzModels = findEffectedDataZooms(chart.getModel(), payload);
+ const dzModels = findEffectedDataZooms(getECModel(chart), payload);
expect(dzModels.length === 3);
- expect(dzModels[0] === chart.getModel().getComponent('dataZoom', 0)).toEqual(true);
- expect(dzModels[1] === chart.getModel().getComponent('dataZoom', 3)).toEqual(true);
- expect(dzModels[2] === chart.getModel().getComponent('dataZoom', 2)).toEqual(true);
+ expect(dzModels[0] === getECModel(chart).getComponent('dataZoom', 0)).toEqual(true);
+ expect(dzModels[1] === getECModel(chart).getComponent('dataZoom', 3)).toEqual(true);
+ expect(dzModels[2] === getECModel(chart).getComponent('dataZoom', 2)).toEqual(true);
});
it('findLinkedNodes_crossXY', function () {
@@ -72,13 +72,13 @@ describe('dataZoom/helper', function () {
});
const payload = { type: 'dataZoom', dataZoomIndex: 0 };
- const dzModels = findEffectedDataZooms(chart.getModel(), payload);
+ const dzModels = findEffectedDataZooms(getECModel(chart), payload);
expect(dzModels.length === 4);
- expect(dzModels[0] === chart.getModel().getComponent('dataZoom', 0)).toEqual(true);
- expect(dzModels[1] === chart.getModel().getComponent('dataZoom', 1)).toEqual(true);
- expect(dzModels[2] === chart.getModel().getComponent('dataZoom', 2)).toEqual(true);
- expect(dzModels[3] === chart.getModel().getComponent('dataZoom', 3)).toEqual(true);
+ expect(dzModels[0] === getECModel(chart).getComponent('dataZoom', 0)).toEqual(true);
+ expect(dzModels[1] === getECModel(chart).getComponent('dataZoom', 1)).toEqual(true);
+ expect(dzModels[2] === getECModel(chart).getComponent('dataZoom', 2)).toEqual(true);
+ expect(dzModels[3] === getECModel(chart).getComponent('dataZoom', 3)).toEqual(true);
});
it('findLinkedNodes_emptySourceModel', function () {
@@ -95,7 +95,7 @@ describe('dataZoom/helper', function () {
});
const payload = { type: 'other' };
- const dzModels = findEffectedDataZooms(chart.getModel(), payload);
+ const dzModels = findEffectedDataZooms(getECModel(chart), payload);
expect(dzModels.length === 0);
});
diff --git a/test/ut/spec/component/graphic/setOption.test.ts b/test/ut/spec/component/graphic/setOption.test.ts
index 6dddca2..815915d 100755
--- a/test/ut/spec/component/graphic/setOption.test.ts
+++ b/test/ut/spec/component/graphic/setOption.test.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { createChart, getGraphicElements } from '../../../core/utHelper';
+import { createChart, getGraphicElements, getECModel } from '../../../core/utHelper';
// import { imageURI } from './setOptionImageURI';
import { EChartsType } from '../../../../../src/echarts';
import Element from 'zrender/src/Element';
@@ -338,8 +338,8 @@ describe('graphic_setOption', function () {
]
});
- expect(!!chart.getModel().getComponent('graphic')).toEqual(true);
- expect(chart.getModel().getComponent('graphic', 1) == null).toEqual(true);
+ expect(!!getECModel(chart).getComponent('graphic')).toEqual(true);
+ expect(getECModel(chart).getComponent('graphic', 1) == null).toEqual(true);
});
diff --git a/test/ut/spec/component/visualMap/setOption.test.ts b/test/ut/spec/component/visualMap/setOption.test.ts
index 3fe1488..c0f63df 100755
--- a/test/ut/spec/component/visualMap/setOption.test.ts
+++ b/test/ut/spec/component/visualMap/setOption.test.ts
@@ -18,7 +18,7 @@
* under the License.
*/
-import { createChart } from '../../../core/utHelper';
+import { createChart, getECModel } from '../../../core/utHelper';
import { EChartsType } from '../../../../../src/echarts';
import { EChartsFullOption } from '../../../../../src/option';
import { ContinousVisualMapOption } from '../../../../../src/component/visualMap/ContinuousModel';
@@ -256,7 +256,7 @@ describe('vsiaulMap_setOption', function () {
]
});
- const ecModel = chart.getModel();
+ const ecModel = getECModel(chart);
function getVisual(idx: number, visualType: 'color' | 'opacity' | 'symbol') {
return (ecModel.getComponent('visualMap', idx) as VisualMapModel)
diff --git a/test/ut/spec/model/Global.test.ts b/test/ut/spec/model/Global.test.ts
index 399f653..ff26ed5 100755
--- a/test/ut/spec/model/Global.test.ts
+++ b/test/ut/spec/model/Global.test.ts
@@ -19,7 +19,7 @@
*/
import { EChartsType } from '../../../../src/echarts';
-import { createChart } from '../../core/utHelper';
+import { createChart, getECModel } from '../../core/utHelper';
import { ComponentMainType, ParsedValue } from '../../../../src/util/types';
import SeriesModel from '../../../../src/model/Series';
import ComponentModel from '../../../../src/model/Component';
@@ -39,11 +39,11 @@ describe('modelAndOptionMapping', function () {
}
function getSeries(chart: EChartsType, seriesIndex: number): SeriesModel {
- return chart.getModel().getComponent('series', seriesIndex) as SeriesModel;
+ return getECModel(chart).getComponent('series', seriesIndex) as SeriesModel;
}
function getModel(chart: EChartsType, type: ComponentMainType, index: number): ComponentModel {
- return chart.getModel().getComponent(type, index);
+ return getECModel(chart).getComponent(type, index);
}
function countSeries(chart: EChartsType): number {
@@ -54,7 +54,7 @@ describe('modelAndOptionMapping', function () {
// FIXME
// access private
// @ts-ignore
- return chart.getModel()._componentsMap.get(type).length;
+ return getECModel(chart)._componentsMap.get(type).length;
}
function getChartView(chart: EChartsType, series: SeriesModel): ChartView {
@@ -801,14 +801,14 @@ describe('modelAndOptionMapping', function () {
]
};
chart.setOption(option);
- expect(chart.getModel().option.backgroundColor).toEqual('rgba(1,1,1,1)');
+ expect(getECModel(chart).option.backgroundColor).toEqual('rgba(1,1,1,1)');
// Not merge
chart.setOption({
backgroundColor: '#fff'
}, true);
- expect(chart.getModel().option.backgroundColor).toEqual('#fff');
+ expect(getECModel(chart).option.backgroundColor).toEqual('#fff');
});
it('innerId', function () {
diff --git a/test/ut/spec/model/timelineMediaOptions.test.ts b/test/ut/spec/model/timelineMediaOptions.test.ts
index 2751a14..8bcb342 100755
--- a/test/ut/spec/model/timelineMediaOptions.test.ts
+++ b/test/ut/spec/model/timelineMediaOptions.test.ts
@@ -23,7 +23,7 @@ import SeriesModel from '../../../../src/model/Series';
import { ParsedValue } from '../../../../src/util/types';
import { LegendOption } from '../../../../src/component/legend/LegendModel';
import TimelineModel from '../../../../src/component/timeline/TimelineModel';
-import { createChart } from '../../core/utHelper';
+import { createChart, getECModel } from '../../core/utHelper';
import { EChartsFullOption } from '../../../../src/option';
@@ -33,13 +33,13 @@ describe('timelineMediaOptions', function () {
return getSeries(chart, seriesIndex).getData().get('y', 0);
}
function getSeries(chart: EChartsType, seriesIndex: number): SeriesModel {
- return chart.getModel().getComponent('series', seriesIndex) as SeriesModel;
+ return getECModel(chart).getComponent('series', seriesIndex) as SeriesModel;
}
function getLegendOption(chart: EChartsType): LegendOption {
- return chart.getModel().getComponent('legend', 0).option;
+ return getECModel(chart).getComponent('legend', 0).option;
}
function getTimelineComponent(chart: EChartsType): TimelineModel {
- return chart.getModel().getComponent('timeline', 0) as TimelineModel;
+ return getECModel(chart).getComponent('timeline', 0) as TimelineModel;
}
let chart: EChartsType;
@@ -388,7 +388,7 @@ describe('timelineMediaOptions', function () {
};
chart.setOption(option);
- let ecModel = chart.getModel();
+ let ecModel = getECModel(chart);
expect(getData0(chart, 0)).toEqual(1111);
expect(getData0(chart, 1)).toEqual(2222);
@@ -410,7 +410,7 @@ describe('timelineMediaOptions', function () {
}]
});
- ecModel = chart.getModel();
+ ecModel = getECModel(chart);
const optionGotten = ecModel.getOption();
expect(optionGotten.backgroundColor).toEqual('#987654');
expect(getData0(chart, 0)).toEqual(1111);
diff --git a/test/ut/spec/scale/interval.test.ts b/test/ut/spec/scale/interval.test.ts
index c151ad0..81aed8f 100755
--- a/test/ut/spec/scale/interval.test.ts
+++ b/test/ut/spec/scale/interval.test.ts
@@ -18,7 +18,7 @@
* under the License.
*/
-import { createChart, isValueFinite } from '../../core/utHelper';
+import { createChart, isValueFinite, getECModel } from '../../core/utHelper';
import { EChartsType } from '../../../../src/echarts';
import CartesianAxisModel from '../../../../src/coord/cartesian/AxisModel';
import IntervalScale from '../../../../src/scale/Interval';
@@ -57,7 +57,7 @@ describe('scale_interval', function () {
series: [{type: 'line', data: []}]
});
- const yAxis = chart.getModel().getComponent('yAxis', 0) as CartesianAxisModel;
+ const yAxis = getECModel(chart).getComponent('yAxis', 0) as CartesianAxisModel;
const scale = yAxis.axis.scale;
const ticks = scale.getTicks();
@@ -91,7 +91,7 @@ describe('scale_interval', function () {
]
});
- const yAxis = chart.getModel().getComponent('yAxis', 0) as CartesianAxisModel;
+ const yAxis = getECModel(chart).getComponent('yAxis', 0) as CartesianAxisModel;
const scale = yAxis.axis.scale as IntervalScale;
const ticks = scale.getTicks();
const labels = yAxis.axis.getViewLabels().map(function (item) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org