Merge pull request #288 from holly-cummins/fix-low-value-cube-edge-case

Fix edge case when value is lower than cubes in a column

Author: holly-cummins

graphics-generator/src/main/java/io/quarkus/infra/performance/graphics/charts/Cubes.java

@@ -97,7 +97,7 @@ public void draw(Subcanvas dataArea, Theme theme) {
 
         int cubeSize = cubeGroup.getTotalCubeSize() - CUBE_PADDING;
 
-        Subcanvas cubeArea = new Subcanvas(dataArea, dataArea.getWidth(), cubeGroup.getNumCubesPerColumn() * cubeGroup.getTotalCubeSize(), 0, 0);
+        Subcanvas cubeArea = new Subcanvas(dataArea, dataArea.getWidth(), Math.min(cubeGroup.getNumCubesPerColumn(), (int) (val / cubeGroup.getUnitsPerCube())) * cubeGroup.getTotalCubeSize(), 0, 0);
 
         Subcanvas labelArea = new Subcanvas(dataArea, dataArea.getWidth(), dataArea.getHeight() - cubeArea.getHeight(), 0,
                 cubeArea.getHeight());

graphics-generator/src/test/java/io/quarkus/infra/performance/graphics/charts/ChartTest.java

@@ -2,6 +2,7 @@
 
 import java.util.Random;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import io.quarkus.infra.performance.graphics.PlotDefinition;
 import io.quarkus.infra.performance.graphics.SingleSeriesPlotDefinition;
@@ -137,6 +138,23 @@ public void testCanDrawLargeGroupInPreferredDimensions() {
     @Test
     public void testCanDrawSoloGroupInPreferredDimensions() {
         BenchmarkData data = mockBenchmarkData(1);
+        System.out.println("Data " + data);
+        PlotDefinition plotDefinition = createPlotDefinition();
+
+        Chart chart = createChart(plotDefinition, data);
+
+        int width = chart.getPreferredHorizontalSize();
+        int height = chart.getPreferredVerticalSize();
+
+        SVGGraphics2D svgGenerator = getSvgGraphics2D(width, height);
+        Theme theme = Theme.LIGHT;
+        chart.draw(new Subcanvas(svgGenerator), theme);
+    }
+
+    // This sometimes fails for the cube chart, if the value is less than the column height
+    @Test
+    public void testCanDrawSoloGroupWithLowValueInPreferredDimensions() {
+        BenchmarkData data = mockBenchmarkData(1, () -> 2.0);
         PlotDefinition plotDefinition = createPlotDefinition();
 
         Chart chart = createChart(plotDefinition, data);
@@ -174,13 +192,18 @@ private static BenchmarkData mockBenchmarkData() {
         return mockBenchmarkData(4);
     }
 
+
     private static BenchmarkData mockBenchmarkData(int count) {
+        return mockBenchmarkData(count, () -> (double) new Random().nextInt(400));
+    }
+
+    private static BenchmarkData mockBenchmarkData(int count, Supplier<Double> value) {
         BenchmarkData data = mock(BenchmarkData.class);
         Results results = new Results();
         when(data.results()).thenReturn(results);
         when(data.group()).thenReturn(Group.ALL);
         for (int i = 0; i < count; i++) {
-            addDatapoint(data, Framework.values()[i], (double) new Random().nextInt(400));
+            addDatapoint(data, Framework.values()[i], value.get());
         }
         addConfig(data);
         return data;