Skip to content

Commit 9a9678b

Browse files
committed
Implement correctly
1 parent 2ade407 commit 9a9678b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

chartjs-java-model/src/test/java/software/xdev/chartjs/model/BarChartTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import software.xdev.chartjs.model.dataset.BarDataset;
3131
import software.xdev.chartjs.model.options.BarOptions;
3232
import software.xdev.chartjs.model.options.scale.Scales;
33+
import software.xdev.chartjs.model.options.scale.cartesian.AbstractCartesianScaleOptions;
3334
import software.xdev.chartjs.model.options.scale.cartesian.CartesianScaleOptions;
3435
import software.xdev.chartjs.model.options.scale.cartesian.linear.LinearScaleOptions;
3536
import software.xdev.chartjs.model.options.scale.cartesian.linear.LinearTickOptions;
@@ -72,7 +73,7 @@ void testScale(final BiConsumer<BarDataset, BigDecimal> addDataFunc)
7273
.addScale(
7374
Scales.ScaleAxis.Y,
7475
new LinearScaleOptions()
75-
.setTitle(new CartesianScaleOptions.Title().setText("Test"))
76+
.setTitle(new AbstractCartesianScaleOptions.Title().setText("Test"))
7677
.setMax(BigDecimal.valueOf(2)));
7778

7879
final BarChart chart = new BarChart()
@@ -107,8 +108,8 @@ void testStacked()
107108
.setAnimation(false);
108109
options
109110
.getScales()
110-
.addScale(Scales.ScaleAxis.X, new LinearScaleOptions().setStacked(true))
111-
.addScale(Scales.ScaleAxis.Y, new LinearScaleOptions().setStacked(true));
111+
.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
112+
.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
112113

113114
this.createScreenshotAndCompare(
114115
new BarChart(data, options),
@@ -133,7 +134,7 @@ void testTicked()
133134
.getScales()
134135
.addScale(Scales.ScaleAxis.Y, new LinearScaleOptions()
135136
.setMin(20)
136-
.setMax(200)
137+
.setMax(100)
137138
.setTicks(new LinearTickOptions()
138139
.setStepSize(5)));
139140

@@ -166,8 +167,8 @@ void testStackedHorizontal()
166167
.setIndexAxis(BarOptions.IndexAxis.Y);
167168
options
168169
.getScales()
169-
.addScale(Scales.ScaleAxis.X, new LinearScaleOptions().setStacked(true))
170-
.addScale(Scales.ScaleAxis.Y, new LinearScaleOptions().setStacked(true));
170+
.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
171+
.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
171172

172173
this.createScreenshotAndCompare(
173174
new BarChart(data, options),
@@ -209,8 +210,8 @@ void testStackedWithGroups()
209210
.setIndexAxis(BarOptions.IndexAxis.Y);
210211
options
211212
.getScales()
212-
.addScale(Scales.ScaleAxis.X, new LinearScaleOptions().setStacked(true))
213-
.addScale(Scales.ScaleAxis.Y, new LinearScaleOptions().setStacked(true));
213+
.addScale(Scales.ScaleAxis.X, new CartesianScaleOptions().setStacked(true))
214+
.addScale(Scales.ScaleAxis.Y, new CartesianScaleOptions().setStacked(true));
214215

215216
this.createScreenshotAndCompare(
216217
new BarChart(data, options),
314 Bytes
Loading

0 commit comments

Comments
 (0)