@@ -6,16 +6,10 @@ jest.mock("@mendix/shared-charts/main", () => {
66 } ;
77} ) ;
88
9- import { ChartWidget } from "@mendix/shared-charts/main" ;
10- import {
11- EditableValueBuilder ,
12- list ,
13- ListAttributeValueBuilder ,
14- listExpression
15- } from "@mendix/widget-plugin-test-utils" ;
9+ import { ChartWidget , setupBasicSeries } from "@mendix/shared-charts/main" ;
10+ import { listExpression } from "@mendix/widget-plugin-test-utils" ;
1611import "@testing-library/jest-dom" ;
1712import { render , RenderResult } from "@testing-library/react" ;
18- import Big from "big.js" ;
1913import { createElement } from "react" ;
2014import { SeriesType } from "../../typings/AreaChartProps" ;
2115import { AreaChart } from "../AreaChart" ;
@@ -28,7 +22,7 @@ describe("The AreaChart widget", () => {
2822 < AreaChart
2923 name = "line-chart-test"
3024 class = "line-chart-class"
31- series = { configs . map ( setupBasicSeries ) }
25+ series = { configs . map ( setupBasicAreaSeries ) }
3226 showLegend = { false }
3327 widthUnit = "percentage"
3428 width = { 0 }
@@ -159,30 +153,15 @@ describe("The AreaChart widget", () => {
159153 } ) ;
160154} ) ;
161155
162- function setupBasicSeries ( overwriteConfig : Partial < SeriesType > ) : SeriesType {
163- const xAttribute = new ListAttributeValueBuilder < Big > ( ) . build ( ) ;
164- const getXAttributeMock = jest . fn ( ) ;
165- getXAttributeMock . mockReturnValueOnce ( new EditableValueBuilder < Big > ( ) . withValue ( new Big ( 1 ) ) . build ( ) ) ;
166- getXAttributeMock . mockReturnValueOnce ( new EditableValueBuilder < Big > ( ) . withValue ( new Big ( 2 ) ) . build ( ) ) ;
167- xAttribute . get = getXAttributeMock ;
168-
169- const yAttribute = new ListAttributeValueBuilder < Big > ( ) . build ( ) ;
170- const getYAttributeMock = jest . fn ( ) ;
171- getYAttributeMock . mockReturnValueOnce ( new EditableValueBuilder < Big > ( ) . withValue ( new Big ( 3 ) ) . build ( ) ) ;
172- getYAttributeMock . mockReturnValueOnce ( new EditableValueBuilder < Big > ( ) . withValue ( new Big ( 6 ) ) . build ( ) ) ;
173- yAttribute . get = getYAttributeMock ;
156+ function setupBasicAreaSeries ( overwriteConfig : Partial < SeriesType > ) : SeriesType {
157+ const basicSeries = setupBasicSeries ( overwriteConfig ) as SeriesType ;
174158
175159 return {
176- dataSet : "static" ,
177- customSeriesOptions : overwriteConfig . customSeriesOptions ?? "" ,
178- aggregationType : overwriteConfig . aggregationType ?? "avg" ,
160+ ...basicSeries ,
179161 interpolation : overwriteConfig . interpolation ?? "linear" ,
180162 lineStyle : overwriteConfig . lineStyle ?? "line" ,
181163 staticLineColor : overwriteConfig . staticLineColor ?? undefined ,
182164 staticMarkerColor : overwriteConfig . staticMarkerColor ?? undefined ,
183- staticFillColor : overwriteConfig . staticFillColor ?? undefined ,
184- staticDataSource : list ( 2 ) ,
185- staticXAttribute : xAttribute ,
186- staticYAttribute : yAttribute
165+ staticFillColor : overwriteConfig . staticFillColor ?? undefined
187166 } ;
188167}
0 commit comments