Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: 修复 L7 升级导致单测中 rawConfig 判断错误问题 #302

Merged
merged 1 commit into from
Jul 1, 2023
Merged

test: 修复 L7 升级导致单测中 rawConfig 判断错误问题 #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/composite-layers/__tests__/unit/composite-layers/bubble-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { BubbleLayer } from '../../../../src/composite-layers/bubble-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('bubble layer', () => {
const layer = new BubbleLayer({
Expand Down Expand Up @@ -85,7 +85,7 @@ describe('bubble layer', () => {
attributeField: 'label',
attributeValues: 'text',
});
expect(layer.labelLayer.layer['rawConfig']).toMatchObject({
expect(layer.labelLayer.layer['needUpdateConfig']).toMatchObject({
opacity: 0.6,
textAnchor: 'top',
textOffset: [0, 20],
Expand All @@ -98,7 +98,7 @@ describe('bubble layer', () => {
});

it('style', () => {
expect(layer.fillLayer.layer['rawConfig']).toMatchObject({
expect(layer.fillLayer.layer['needUpdateConfig']).toMatchObject({
opacity: 1,
strokeWidth: 1,
stroke: 'red',
Expand All @@ -114,7 +114,7 @@ describe('bubble layer', () => {
attributeName: 'size',
attributeField: 12,
});
expect(layer.highlightStrokeLayer.layer['rawConfig']).toMatchObject({
expect(layer.highlightStrokeLayer.layer['needUpdateConfig']).toMatchObject({
opacity: 0,
strokeWidth: 1.5,
stroke: 'green',
Expand All @@ -125,7 +125,7 @@ describe('bubble layer', () => {
attributeName: 'size',
attributeField: 12,
});
expect(layer.selectStrokeLayer.layer['rawConfig']).toMatchObject({
expect(layer.selectStrokeLayer.layer['needUpdateConfig']).toMatchObject({
opacity: 0,
strokeWidth: 1.5,
stroke: 'yellow',
Expand Down
12 changes: 6 additions & 6 deletions packages/composite-layers/__tests__/unit/composite-layers/choropleth-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { ChoroplethLayer } from '../../../../src/composite-layers/choropleth-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('choropleth layer', () => {
const layer = new ChoroplethLayer({
Expand Down Expand Up @@ -86,7 +86,7 @@ describe('choropleth layer', () => {
attributeField: 'label',
attributeValues: 'text',
});
expect(layer.labelLayer.layer['rawConfig']).toMatchObject({
expect(layer.labelLayer.layer['needUpdateConfig']).toMatchObject({
opacity: 0.6,
textAnchor: 'top',
textOffset: [0, 20],
Expand All @@ -99,9 +99,9 @@ describe('choropleth layer', () => {
});

it('style', () => {
expect(layer.fillLayer.layer['rawConfig']).toMatchObject({ opacity: 1 });
expect(layer.fillLayer.layer['needUpdateConfig']).toMatchObject({ opacity: 1 });

expect(layer.strokeLayer.layer['rawConfig']).toMatchObject({ opacity: 1 });
expect(layer.strokeLayer.layer['needUpdateConfig']).toMatchObject({ opacity: 1 });
expect(getLayerStyleAttribute(layer.strokeLayer.layer['pendingStyleAttributes'], 'color')).toEqual({
attributeName: 'color',
attributeField: 'rgb(93,112,146)',
Expand All @@ -124,7 +124,7 @@ describe('choropleth layer', () => {
attributeName: 'size',
attributeField: 1.5,
});
expect(layer.highlightStrokeLayer.layer['rawConfig']).toMatchObject({ opacity: 0.8 });
expect(layer.highlightStrokeLayer.layer['needUpdateConfig']).toMatchObject({ opacity: 0.8 });

expect(getLayerStyleAttribute(layer.selectStrokeLayer.layer['pendingStyleAttributes'], 'color')).toEqual({
attributeName: 'color',
Expand All @@ -134,6 +134,6 @@ describe('choropleth layer', () => {
attributeName: 'size',
attributeField: 1.5,
});
expect(layer.selectStrokeLayer.layer['rawConfig']).toMatchObject({ opacity: 0.8 });
expect(layer.selectStrokeLayer.layer['needUpdateConfig']).toMatchObject({ opacity: 0.8 });
});
});
4 changes: 2 additions & 2 deletions packages/composite-layers/__tests__/unit/core-layers/heatmap-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { HeatmapLayer } from '../../../../src/core-layers/heatmap-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('heatmap layer', () => {
const layer = new HeatmapLayer({
Expand Down Expand Up @@ -41,7 +41,7 @@ describe('heatmap layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({
expect(layer.layer['needUpdateConfig']).toMatchObject({
intensity: 3,
radius: 20,
opacity: 1,
Expand Down
4 changes: 2 additions & 2 deletions packages/composite-layers/__tests__/unit/core-layers/line-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { LineLayer } from '../../../../src/core-layers/line-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('line layer', () => {
const layer = new LineLayer({
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('line layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1, lineType: 'dash' });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, lineType: 'dash' });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/composite-layers/__tests__/unit/core-layers/point-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { PointLayer } from '../../../../src/core-layers/point-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('point layer', () => {
const layer = new PointLayer({
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('point layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/composite-layers/__tests__/unit/core-layers/polygon-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { PolygonLayer } from '../../../../src/core-layers/polygon-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('polygon layer', () => {
const layer = new PolygonLayer({
Expand Down Expand Up @@ -42,7 +42,7 @@ describe('polygon layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1 });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1 });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/composite-layers/__tests__/unit/core-layers/text-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { TextLayer } from '../../../../src/core-layers/text-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('text layer', () => {
const layer = new TextLayer({
Expand Down Expand Up @@ -48,7 +48,7 @@ describe('text layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({
expect(layer.layer['needUpdateConfig']).toMatchObject({
opacity: 0.6,
textAnchor: 'top',
textOffset: [0, 20],
Expand Down
7 changes: 3 additions & 4 deletions packages/l7plot/__tests__/unit/adaptor/layer/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Source } from '@antv/l7';
import { getLayerStyleAttribute } from '../../../helper/layer';
import { DotLayer } from '../../../../src/layers/dot-layer';
import { DotLayerOptions } from '../../../../src/layers/dot-layer';
import { DotLayer, DotLayerOptions } from '../../../../src/layers/dot-layer';
import { LinesLayer, LinesLayerOptions } from '../../../../src/layers/lines-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('mapping layer', () => {
const source = new Source([], { parser: { type: 'json', x: 'x', y: 'y' } });
Expand Down Expand Up @@ -132,7 +131,7 @@ describe('mapping layer', () => {

expect(plotLayer.layer.type).toBe('PointLayer');

expect(plotLayer.layer['rawConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
expect(plotLayer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
});

it('mapping state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/arc-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { ArcLayer } from '../../../../src/layers/arc-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('arc layer', () => {
const layer = new ArcLayer({
Expand Down Expand Up @@ -37,7 +37,7 @@ describe('arc layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1 });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1 });
});

it('state', () => {
Expand Down
8 changes: 4 additions & 4 deletions packages/l7plot/__tests__/unit/layers/area-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { AreaLayer } from '../../../../src/layers/area-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('area layer', () => {
const layer = new AreaLayer({
Expand Down Expand Up @@ -57,7 +57,7 @@ describe('area layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1 });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1 });
});

it('state', () => {
Expand All @@ -69,7 +69,7 @@ describe('area layer', () => {
attributeName: 'size',
attributeField: 1.5,
});
expect(layer.highlightLayer['rawConfig']).toMatchObject({ opacity: 0.8 });
expect(layer.highlightLayer['needUpdateConfig']).toMatchObject({ opacity: 0.8 });
expect(getLayerStyleAttribute(layer.selectStrokeLayer['pendingStyleAttributes'], 'color')).toEqual({
attributeName: 'color',
attributeField: 'yellow',
Expand All @@ -78,6 +78,6 @@ describe('area layer', () => {
attributeName: 'size',
attributeField: 1.5,
});
expect(layer.selectStrokeLayer['rawConfig']).toMatchObject({ opacity: 0.8 });
expect(layer.selectStrokeLayer['needUpdateConfig']).toMatchObject({ opacity: 0.8 });
});
});
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/dot-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Source } from '@antv/l7';
import { getLayerStyleAttribute } from '../../../helper/layer';
import { DotLayer } from '../../../../src/layers/dot-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('dot layer', () => {
const layer = new DotLayer({
Expand Down Expand Up @@ -39,7 +39,7 @@ describe('dot layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/grid-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { GridLayer } from '../../../../src/layers/grid-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('grid layer', () => {
const layer = new GridLayer({
Expand Down Expand Up @@ -57,7 +57,7 @@ describe('grid layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({
expect(layer.layer['needUpdateConfig']).toMatchObject({
coverage: 0.8,
angle: 0,
opacity: 1.0,
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/heatmap-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Source } from '@antv/l7';
import { getLayerStyleAttribute } from '../../../helper/layer';
import { HeatmapLayer } from '../../../../src/layers/heatmap-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('heatmap layer', () => {
const layer = new HeatmapLayer({
Expand Down Expand Up @@ -46,7 +46,7 @@ describe('heatmap layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({
expect(layer.layer['needUpdateConfig']).toMatchObject({
intensity: 3,
radius: 20,
opacity: 1,
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/hexbin-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { HexbinLayer } from '../../../../src/layers/hexbin-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('hexagon layer', () => {
const layer = new HexbinLayer({
Expand Down Expand Up @@ -56,7 +56,7 @@ describe('hexagon layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({
expect(layer.layer['needUpdateConfig']).toMatchObject({
coverage: 0.8,
angle: 0,
opacity: 1.0,
Expand Down
6 changes: 3 additions & 3 deletions packages/l7plot/__tests__/unit/layers/icon-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Source } from '@antv/l7';
import { getLayerStyleAttribute } from '../../../helper/layer';
import { IconLayer } from '../../../../src/layers/icon-layer';
import { registerImages } from '../../../../src';
import { IconLayer } from '../../../../src/layers/icon-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('icon layer', () => {
const images = [
Expand Down Expand Up @@ -45,7 +45,7 @@ describe('icon layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, strokeWidth: 1, stroke: 'red' });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/lines-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { LinesLayer } from '../../../../src/layers/lines-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('lines layer', () => {
const layer = new LinesLayer({
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('lines layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1, lineType: 'dash' });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, lineType: 'dash' });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/path-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { PathLayer } from '../../../../src/layers/path-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('path layer', () => {
const layer = new PathLayer({
Expand Down Expand Up @@ -37,7 +37,7 @@ describe('path layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1, lineType: 'dash' });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1, lineType: 'dash' });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/prism-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLayerStyleAttribute } from '../../../helper/layer';
import { PrismLayer } from '../../../../src/layers/prism-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('prism layer', () => {
const layer = new PrismLayer({
Expand Down Expand Up @@ -43,7 +43,7 @@ describe('prism layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({ opacity: 1 });
expect(layer.layer['needUpdateConfig']).toMatchObject({ opacity: 1 });
});

it('state', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/l7plot/__tests__/unit/layers/text-layer/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Source } from '@antv/l7';
import { getLayerStyleAttribute } from '../../../helper/layer';
import { TextLayer } from '../../../../src/layers/text-layer';
import { getLayerStyleAttribute } from '../../../helper/layer';

describe('text layer', () => {
const layer = new TextLayer({
Expand Down Expand Up @@ -49,7 +49,7 @@ describe('text layer', () => {
});

it('style', () => {
expect(layer.layer['rawConfig']).toMatchObject({
expect(layer.layer['needUpdateConfig']).toMatchObject({
opacity: 0.6,
textAnchor: 'top',
textOffset: [0, 20],
Expand Down
Loading