- Fixed #14857: Highlight text misplaced in charts with multiple bar data

  sets.

1 files changed, 58 insertions, 0 deletions

diff --git a/tests/renderer_2d_test.php b/tests/renderer_2d_test.php
index 4faa6ca..4a4a73b 100644
--- a/tests/renderer_2d_test.php
+++ b/tests/renderer_2d_test.php
@@ -2261,6 +2261,64 @@ class ezcGraphRenderer2dTest extends ezcGraphTestCase
 
         $chart->data['Line 1']->highlight = true;
         $chart->data['Line 2']->highlight['sample 5'] = true;
+
+        $chart->options->highlightSize = 12;
+        $chart->options->highlightFont->color = ezcGraphColor::fromHex( '#3465A4' );
+        $chart->options->highlightFont->background = ezcGraphColor::fromHex( '#D3D7CF' );
+        $chart->options->highlightFont->border = ezcGraphColor::fromHex( '#888A85' );
+        
+        $chart->xAxis->axisLabelRenderer = new ezcGraphAxisBoxedLabelRenderer();
+
+        $chart->render( 500, 200, $filename );
+
+        $this->compare(
+            $filename,
+            $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.svg'
+        );
+    }
+
+    public function testRenderBarChartWithHighlightedData3Bars()
+    {
+        $filename = $this->tempDir . __FUNCTION__ . '.svg';
+
+        $chart = new ezcGraphBarChart();
+        $chart->palette = new ezcGraphPaletteBlack();
+
+        $chart->data['Line 1'] = new ezcGraphArrayDataSet( array( 'sample 1' => 234, 'sample 2' => -21, 'sample 3' => 324, 'sample 4' => -120, 'sample 5' => 1) );
+        $chart->data['Line 2'] = new ezcGraphArrayDataSet( array( 'sample 1' => 543, 'sample 2' => 234, 'sample 3' => 298, 'sample 4' => 5, 'sample 5' => 613) );
+        $chart->data['Line 3'] = new ezcGraphArrayDataSet( array( 'sample 2' => 42, 'sample 3' => 398, 'sample 4' => -15, 'sample 5' => 244) );
+
+        $chart->data['Line 1']->highlight = true;
+        $chart->data['Line 2']->highlight['sample 5'] = true;
+        $chart->data['Line 3']->highlight = true;
+
+        $chart->options->highlightSize = 12;
+        $chart->options->highlightFont->color = ezcGraphColor::fromHex( '#3465A4' );
+        $chart->options->highlightFont->background = ezcGraphColor::fromHex( '#D3D7CF' );
+        $chart->options->highlightFont->border = ezcGraphColor::fromHex( '#888A85' );
+        
+        $chart->xAxis->axisLabelRenderer = new ezcGraphAxisBoxedLabelRenderer();
+
+        $chart->render( 500, 200, $filename );
+
+        $this->compare(
+            $filename,
+            $this->basePath . 'compare/' . __CLASS__ . '_' . __FUNCTION__ . '.svg'
+        );
+    }
+
+    public function testRenderBarChartWithHighlightedData()
+    {
+        $filename = $this->tempDir . __FUNCTION__ . '.svg';
+
+        $chart = new ezcGraphBarChart();
+        $chart->palette = new ezcGraphPaletteBlack();
+
+        $chart->data['Line 1'] = new ezcGraphArrayDataSet( array( 'sample 1' => 234, 'sample 2' => -21, 'sample 3' => 324, 'sample 4' => -120, 'sample 5' => 1) );
+        $chart->data['Line 2'] = new ezcGraphArrayDataSet( array( 'sample 1' => 543, 'sample 2' => 234, 'sample 3' => 298, 'sample 4' => 5, 'sample 5' => 613) );
+
+        $chart->data['Line 1']->highlight = true;
+        $chart->data['Line 2']->highlight['sample 5'] = true;
         
         $chart->data['Line 1']->displayType = ezcGraph::BAR;