- Fixed bug #11235: In interactive 3d bar charts circle and bullet bars are not

  linked.
  # Numeric part of IDs in SVG files changed because one element missed an ID
  # Also ensured mimetype 'application/octet-stream' for all SVG test files

1 files changed, 72 insertions, 5 deletions

diff --git a/tests/image_map_test.php b/tests/image_map_test.php
index 396ef5c..12b8b3d 100644
--- a/tests/image_map_test.php
+++ b/tests/image_map_test.php
@@ -207,6 +207,73 @@ class ezcGraphImageMapTest extends ezcGraphTestCase
         $this->assertSame( 'http://example.com/', $reference['legend_url']['sampleData'], 'Link expected for "sampleData".' );
     }
 
+    public function testReturnFrom3dSvgBarChart()
+    {
+        $filename = $this->tempDir . __FUNCTION__ . '.svg';
+
+        $chart = new ezcGraphBarChart();
+        $chart->palette = new ezcGraphPaletteBlack();
+        $chart->renderer = new ezcGraphRenderer3d();
+
+        $chart->data['sampleData'] = new ezcGraphArrayDataSet( array( 'sample 1' => 234, 'sample 2' => 21, 'sample 3' => 324, 'sample 4' => 120, 'sample 5' => 1) );
+        $chart->data['moreData'] = new ezcGraphArrayDataSet( array( 'sample 1' => 234, 'sample 2' => 21, 'sample 3' => 324, 'sample 4' => 120, 'sample 5' => 1) );
+        $chart->data['evenMoreData'] = new ezcGraphArrayDataSet( array( 'sample 1' => 234, 'sample 2' => 21, 'sample 3' => 324, 'sample 4' => 120, 'sample 5' => 1) );
+
+        $chart->data['sampleData']->url = 'http://example.com/sampleData';
+        $chart->data['sampleData']->symbol = ezcGraph::DIAMOND;
+        $chart->data['moreData']->url = 'http://example.com/moreData';
+        $chart->data['moreData']->symbol = ezcGraph::CIRCLE;
+        $chart->data['evenMoreData']->url = 'http://example.com/evenMoreData';
+        $chart->data['evenMoreData']->symbol = ezcGraph::BULLET;
+
+        $chart->render( 500, 200, $filename );
+        
+        $reference = $chart->renderer->getElementReferences();
+
+        // Check data references
+        $this->assertSame( 3, count( $reference['data'] ), '3 datasets expected.' );
+        $this->assertSame( 5, count( $reference['data']['sampleData'] ), '[sampleData] 5 datapoints expected.' );
+        $this->assertSame( 3, count( $reference['data']['sampleData']['sample 2'] ), '[sampleData] 3 elements for datapoint expected.' );
+        $this->assertSame( 'ezcGraphPolygon_98', $reference['data']['sampleData']['sample 2'][0], '[sampleData] ezcGraph element expected.' );
+        $this->assertSame( 'ezcGraphPolygon_99', $reference['data']['sampleData']['sample 2'][1], '[sampleData] ezcGraph element expected.' );
+        $this->assertSame( 'ezcGraphPolygon_100', $reference['data']['sampleData']['sample 2'][2], '[sampleData] ezcGraph element expected.' );
+
+        // Check data references
+        $this->assertSame( 5, count( $reference['data']['moreData'] ), '[moreData] 5 datapoints expected.' );
+        $this->assertSame( 2, count( $reference['data']['moreData']['sample 2'] ), '[moreData] 3 elements for datapoint expected.' );
+        $this->assertSame( 'ezcGraphCircularArc_102', $reference['data']['moreData']['sample 2'][0], '[moreData] ezcGraph element expected.' );
+        $this->assertSame( 'ezcGraphCircle_103', $reference['data']['moreData']['sample 2'][1], '[moreData] ezcGraph element expected.' );
+
+        // Check data references
+        $this->assertSame( 5, count( $reference['data']['evenMoreData'] ), '[evenMoreData] 5 datapoints expected.' );
+        $this->assertSame( 2, count( $reference['data']['evenMoreData']['sample 2'] ), '[evenMoreData] 3 elements for datapoint expected.' );
+        $this->assertSame( 'ezcGraphCircularArc_105', $reference['data']['evenMoreData']['sample 2'][0], '[evenMoreData] ezcGraph element expected.' );
+        $this->assertSame( 'ezcGraphCircle_106', $reference['data']['evenMoreData']['sample 2'][1], '[evenMoreData] ezcGraph element expected.' );
+
+        // Check legend references
+        $this->assertSame( 3, count( $reference['legend'] ), '3 legend items expected.' );
+        $this->assertSame( 2, count( $reference['legend']['sampleData'] ), '2 elements for legend item expected.' );
+        $this->assertSame( 'ezcGraphPolygon_4', $reference['legend']['sampleData']['symbol'], 'ezcGraphCircle expected as legend symbol.' );
+        $this->assertSame( 'ezcGraphTextBox_5', $reference['legend']['sampleData']['text'], 'ezcGraphTextBox expected for legend text.' );
+        
+        // Check legend references
+        $this->assertSame( 3, count( $reference['legend'] ), '3 legend items expected.' );
+        $this->assertSame( 2, count( $reference['legend']['moreData'] ), '2 elements for legend item expected.' );
+        $this->assertSame( 'ezcGraphCircle_6', $reference['legend']['moreData']['symbol'], 'ezcGraphCircle expected as legend symbol.' );
+        $this->assertSame( 'ezcGraphTextBox_7', $reference['legend']['moreData']['text'], 'ezcGraphTextBox expected for legend text.' );
+        
+        // Check legend references
+        $this->assertSame( 3, count( $reference['legend'] ), '3 legend items expected.' );
+        $this->assertSame( 2, count( $reference['legend']['evenMoreData'] ), '2 elements for legend item expected.' );
+        $this->assertSame( 'ezcGraphCircle_8', $reference['legend']['evenMoreData']['symbol'], 'ezcGraphCircle expected as legend symbol.' );
+        $this->assertSame( 'ezcGraphTextBox_9', $reference['legend']['evenMoreData']['text'], 'ezcGraphTextBox expected for legend text.' );
+        
+        // Check for legend URLs
+        $this->assertSame( 3, count( $reference['legend_url'] ), '3 legend url items expected.' );
+        $this->assertSame( 'http://example.com/moreData', $reference['legend_url']['moreData'], 'Link expected for "moreData".' );
+        $this->assertSame( 'http://example.com/sampleData', $reference['legend_url']['sampleData'], 'Link expected for "sampleData".' );
+    }
+
     public function testReturnFrom3dSvgPieChart()
     {
         $filename = $this->tempDir . __FUNCTION__ . '.svg';
@@ -231,8 +298,8 @@ class ezcGraphImageMapTest extends ezcGraphTestCase
         $this->assertSame( 1, count( $reference['data'] ), 'One dataset expected.' );
         $this->assertSame( 5, count( $reference['data']['sample'] ), '5 datapoints expected.' );
         $this->assertSame( 2, count( $reference['data']['sample']['Mozilla'] ), '2 elements for datapoint expexted' );
-        $this->assertSame( 'ezcGraphCircleSector_40', $reference['data']['sample']['Mozilla'][0], 'ezcGraphCircleSector expected.' );
-        $this->assertSame( 'ezcGraphTextBox_61', $reference['data']['sample']['Mozilla'][1], 'ezcGraphTextBox expected.' );
+        $this->assertSame( 'ezcGraphCircleSector_46', $reference['data']['sample']['Mozilla'][0], 'ezcGraphCircleSector expected.' );
+        $this->assertSame( 'ezcGraphTextBox_67', $reference['data']['sample']['Mozilla'][1], 'ezcGraphTextBox expected.' );
 
         // Check legend references
         $this->assertSame( 5, count( $reference['legend'] ), '5 legend items expected.' );
@@ -308,9 +375,9 @@ class ezcGraphImageMapTest extends ezcGraphTestCase
         $this->assertSame( 1, count( $reference['data'] ), 'One dataset expected.' );
         $this->assertSame( 5, count( $reference['data']['sample'] ), '5 datapoints expected.' );
         $this->assertSame( 3, count( $reference['data']['sample']['Mozilla'] ), '2 elements for datapoint expexted' );
-        $this->assertSame( 'ezcGraphCircleSector_39', $reference['data']['sample']['Mozilla'][0], 'ezcGraphCircleSector expected.' );
-        $this->assertSame( 'ezcGraphCircleSector_40', $reference['data']['sample']['Mozilla'][1], 'ezcGraphCircleSector expected.' );
-        $this->assertSame( 'ezcGraphTextBox_71', $reference['data']['sample']['Mozilla'][2], 'ezcGraphTextBox expected.' );
+        $this->assertSame( 'ezcGraphCircleSector_45', $reference['data']['sample']['Mozilla'][0], 'ezcGraphCircleSector expected.' );
+        $this->assertSame( 'ezcGraphCircleSector_46', $reference['data']['sample']['Mozilla'][1], 'ezcGraphCircleSector expected.' );
+        $this->assertSame( 'ezcGraphTextBox_77', $reference['data']['sample']['Mozilla'][2], 'ezcGraphTextBox expected.' );
 
         // Check legend references
         $this->assertSame( 5, count( $reference['legend'] ), '5 legend items expected.' );