summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/charts/line.php2
-rw-r--r--src/charts/pie.php8
-rw-r--r--src/datasets/average.php4
-rw-r--r--src/datasets/base.php20
-rw-r--r--src/datasets/property/boolean.php4
-rw-r--r--src/datasets/property/color.php4
-rw-r--r--src/datasets/property/integer.php4
-rw-r--r--src/datasets/property/string.php4
-rw-r--r--src/element/legend.php6
-rw-r--r--src/exceptions/no_such_dataset.php4
-rw-r--r--src/exceptions/too_many_datasets.php4
-rw-r--r--src/exceptions/unknown_dataset_source.php4
-rw-r--r--src/graph_autoload.php20
-rw-r--r--src/interfaces/chart.php16
-rw-r--r--src/interfaces/dataset_property.php8
-rw-r--r--src/interfaces/element.php2
-rw-r--r--tests/dataset_test.php60
-rw-r--r--tests/numeric_axis_test.php2
-rw-r--r--tests/palette_test.php20
-rw-r--r--tests/renderer_2d_test.php8
-rw-r--r--tests/suite.php2
21 files changed, 103 insertions, 103 deletions
diff --git a/src/charts/line.php b/src/charts/line.php
index b0ba8c0..a4a8863 100644
--- a/src/charts/line.php
+++ b/src/charts/line.php
@@ -157,7 +157,7 @@ class ezcGraphLineChart extends ezcGraphChart
$this->elements['yAxis']->calculateAxisBoundings();
// Generate legend
- $this->elements['legend']->generateFromDatasets( $this->data );
+ $this->elements['legend']->generateFromDataSets( $this->data );
// Get boundings from parameters
$this->options->width = $width;
diff --git a/src/charts/pie.php b/src/charts/pie.php
index f886c36..b34915d 100644
--- a/src/charts/pie.php
+++ b/src/charts/pie.php
@@ -27,16 +27,16 @@ class ezcGraphPieChart extends ezcGraphChart
*
* @param string $name Name of dataset
* @param mixed $values Values to create dataset with
- * @throws ezcGraphTooManyDatasetExceptions
+ * @throws ezcGraphTooManyDataSetExceptions
* If too many datasets are created
- * @return ezcGraphDataset
+ * @return ezcGraphDataSet
*/
protected function addDataSet( $name, $values )
{
if ( count( $this->data ) >= 1 &&
!isset( $this->data[$name] ) )
{
- throw new ezcGraphTooManyDatasetsExceptions( $name );
+ throw new ezcGraphTooManyDataSetsExceptions( $name );
}
else
{
@@ -92,7 +92,7 @@ class ezcGraphPieChart extends ezcGraphChart
$this->driver->options->height = $height;
// Generate legend
- $this->elements['legend']->generateFromDataset( reset( $this->data ) );
+ $this->elements['legend']->generateFromDataSet( reset( $this->data ) );
// Get boundings from parameters
$this->options->width = $width;
diff --git a/src/datasets/average.php b/src/datasets/average.php
index b0af528..7d9a662 100644
--- a/src/datasets/average.php
+++ b/src/datasets/average.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDatasetAverage class
+ * File containing the abstract ezcGraphDataSetAverage class
*
* @package Graph
* @version //autogentag//
@@ -12,7 +12,7 @@
*
* @package Graph
*/
-class ezcGraphDatasetAverage extends ezcDataset
+class ezcGraphDataSetAverage extends ezcDataSet
{
}
diff --git a/src/datasets/base.php b/src/datasets/base.php
index b3c76c1..849f996 100644
--- a/src/datasets/base.php
+++ b/src/datasets/base.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDataset class
+ * File containing the abstract ezcGraphDataSet class
*
* @package Graph
* @version //autogentag//
@@ -12,34 +12,34 @@
*
* @package Graph
*/
-class ezcGraphDataset implements ArrayAccess, Iterator
+class ezcGraphDataSet implements ArrayAccess, Iterator
{
/**
* labels for dataset and dataset elements
*
- * @var ezcGraphDatasetStringProperty
+ * @var ezcGraphDataSetStringProperty
*/
protected $label;
/**
* Colors for dataset elements
*
- * @var ezcGraphDatasetColorProperty
+ * @var ezcGraphDataSetColorProperty
*/
protected $color;
/**
* Symbols for dataset elements
*
- * @var ezcGraphDatasetIntProperty
+ * @var ezcGraphDataSetIntProperty
*/
protected $symbol;
/**
* Status if dataset element is hilighted
*
- * @var ezcGraphDatasetBooleanProperty
+ * @var ezcGraphDataSetBooleanProperty
* @access protected
*/
protected $highlight;
@@ -68,10 +68,10 @@ class ezcGraphDataset implements ArrayAccess, Iterator
public function __construct()
{
- $this->label = new ezcGraphDatasetStringProperty( $this );
- $this->color = new ezcGraphDatasetColorProperty( $this );
- $this->symbol = new ezcGraphDatasetIntProperty( $this );
- $this->highlight = new ezcGraphDatasetBooleanProperty( $this );
+ $this->label = new ezcGraphDataSetStringProperty( $this );
+ $this->color = new ezcGraphDataSetColorProperty( $this );
+ $this->symbol = new ezcGraphDataSetIntProperty( $this );
+ $this->highlight = new ezcGraphDataSetBooleanProperty( $this );
$this->highlight->default = false;
}
diff --git a/src/datasets/property/boolean.php b/src/datasets/property/boolean.php
index 318910d..5fad495 100644
--- a/src/datasets/property/boolean.php
+++ b/src/datasets/property/boolean.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDatasetBooleanProperty class
+ * File containing the abstract ezcGraphDataSetBooleanProperty class
*
* @package Graph
* @version //autogentag//
@@ -12,7 +12,7 @@
*
* @package Graph
*/
-class ezcGraphDatasetBooleanProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetBooleanProperty extends ezcGraphDataSetProperty
{
/**
* Converts value to an ezcGraphColor object
diff --git a/src/datasets/property/color.php b/src/datasets/property/color.php
index 4a9d8ba..c963e39 100644
--- a/src/datasets/property/color.php
+++ b/src/datasets/property/color.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDatasetColorProperty class
+ * File containing the abstract ezcGraphDataSetColorProperty class
*
* @package Graph
* @version //autogentag//
@@ -12,7 +12,7 @@
*
* @package Graph
*/
-class ezcGraphDatasetColorProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetColorProperty extends ezcGraphDataSetProperty
{
/**
* Converts value to an ezcGraphColor object
diff --git a/src/datasets/property/integer.php b/src/datasets/property/integer.php
index 28bf7b5..7497c30 100644
--- a/src/datasets/property/integer.php
+++ b/src/datasets/property/integer.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDatasetIntProperty class
+ * File containing the abstract ezcGraphDataSetIntProperty class
*
* @package Graph
* @version //autogentag//
@@ -12,7 +12,7 @@
*
* @package Graph
*/
-class ezcGraphDatasetIntProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetIntProperty extends ezcGraphDataSetProperty
{
/**
* Converts value to an ezcGraphColor object
diff --git a/src/datasets/property/string.php b/src/datasets/property/string.php
index 98eb272..b893755 100644
--- a/src/datasets/property/string.php
+++ b/src/datasets/property/string.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDatasetStringProperty class
+ * File containing the abstract ezcGraphDataSetStringProperty class
*
* @package Graph
* @version //autogentag//
@@ -12,7 +12,7 @@
*
* @package Graph
*/
-class ezcGraphDatasetStringProperty extends ezcGraphDatasetProperty
+class ezcGraphDataSetStringProperty extends ezcGraphDataSetProperty
{
/**
* Converts value to an ezcGraphColor object
diff --git a/src/element/legend.php b/src/element/legend.php
index 1d8fe9e..952bfc1 100644
--- a/src/element/legend.php
+++ b/src/element/legend.php
@@ -117,7 +117,7 @@ class ezcGraphChartElementLegend extends ezcGraphChartElement
* @param array $datasets
* @return void
*/
- public function generateFromDatasets(array $datasets)
+ public function generateFromDataSets(array $datasets)
{
$this->labels = array();
foreach ($datasets as $dataset)
@@ -135,10 +135,10 @@ class ezcGraphChartElementLegend extends ezcGraphChartElement
/**
* Generate legend from single dataset with on entry per data element
*
- * @param ezcGraphDataset $dataset
+ * @param ezcGraphDataSet $dataset
* @return void
*/
- public function generateFromDataset(ezcGraphDataset $dataset)
+ public function generateFromDataSet(ezcGraphDataSet $dataset)
{
$this->labels = array();
foreach ($dataset as $label => $data)
diff --git a/src/exceptions/no_such_dataset.php b/src/exceptions/no_such_dataset.php
index 1346b3b..73093c9 100644
--- a/src/exceptions/no_such_dataset.php
+++ b/src/exceptions/no_such_dataset.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the ezcGraphNoSuchDatasetException class
+ * File containing the ezcGraphNoSuchDataSetException class
*
* @package Graph
* @version //autogen//
@@ -14,7 +14,7 @@
* @package Graph
* @version //autogen//
*/
-class ezcGraphNoSuchDatasetException extends ezcGraphException
+class ezcGraphNoSuchDataSetException extends ezcGraphException
{
public function __construct( $name )
{
diff --git a/src/exceptions/too_many_datasets.php b/src/exceptions/too_many_datasets.php
index 89e41b6..3578212 100644
--- a/src/exceptions/too_many_datasets.php
+++ b/src/exceptions/too_many_datasets.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the ezcGraphTooManyDatasetsExceptions class
+ * File containing the ezcGraphTooManyDataSetsExceptions class
*
* @package Graph
* @version //autogen//
@@ -14,7 +14,7 @@
* @package Graph
* @version //autogen//
*/
-class ezcGraphTooManyDatasetsExceptions extends ezcGraphException
+class ezcGraphTooManyDataSetsExceptions extends ezcGraphException
{
public function __construct()
{
diff --git a/src/exceptions/unknown_dataset_source.php b/src/exceptions/unknown_dataset_source.php
index 7641f2b..63beb52 100644
--- a/src/exceptions/unknown_dataset_source.php
+++ b/src/exceptions/unknown_dataset_source.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the ezcGraphUnknownDatasetSourceException class
+ * File containing the ezcGraphUnknownDataSetSourceException class
*
* @package Graph
* @version //autogen//
@@ -14,7 +14,7 @@
* @package Graph
* @version //autogen//
*/
-class ezcGraphUnknownDatasetSourceException extends ezcGraphException
+class ezcGraphUnknownDataSetSourceException extends ezcGraphException
{
public function __construct( $source )
{
diff --git a/src/graph_autoload.php b/src/graph_autoload.php
index 217f27e..6848661 100644
--- a/src/graph_autoload.php
+++ b/src/graph_autoload.php
@@ -63,17 +63,17 @@ return array(
'ezcGraphChartElementNumericAxis' => 'Graph/axis/numeric.php',
'ezcGraphChartElementLabeledAxis' => 'Graph/axis/labeled.php',
- 'ezcGraphDataset' => 'Graph/datasets/base.php',
- 'ezcGraphDatasetAverage' => 'Graph/datasets/average.php',
- 'ezcGraphDatasetProperty' => 'Graph/interfaces/dataset_property.php',
- 'ezcGraphDatasetColorProperty' => 'Graph/datasets/property/color.php',
- 'ezcGraphDatasetStringProperty' => 'Graph/datasets/property/string.php',
- 'ezcGraphDatasetIntProperty' => 'Graph/datasets/property/integer.php',
- 'ezcGraphDatasetBooleanProperty' => 'Graph/datasets/property/boolean.php',
+ 'ezcGraphDataSet' => 'Graph/datasets/base.php',
+ 'ezcGraphDataSetAverage' => 'Graph/datasets/average.php',
+ 'ezcGraphDataSetProperty' => 'Graph/interfaces/dataset_property.php',
+ 'ezcGraphDataSetColorProperty' => 'Graph/datasets/property/color.php',
+ 'ezcGraphDataSetStringProperty' => 'Graph/datasets/property/string.php',
+ 'ezcGraphDataSetIntProperty' => 'Graph/datasets/property/integer.php',
+ 'ezcGraphDataSetBooleanProperty' => 'Graph/datasets/property/boolean.php',
'ezcGraphNoSuchDataException' => 'Graph/exceptions/no_such_data.php',
- 'ezcGraphNoSuchDatasetException' => 'Graph/exceptions/no_such_dataset.php',
- 'ezcGraphTooManyDatasetsExceptions' => 'Graph/exceptions/too_many_datasets.php',
- 'ezcGraphUnknownDatasetSourceException' => 'Graph/exceptions/unknown_dataset_source.php',
+ 'ezcGraphNoSuchDataSetException' => 'Graph/exceptions/no_such_dataset.php',
+ 'ezcGraphTooManyDataSetsExceptions' => 'Graph/exceptions/too_many_datasets.php',
+ 'ezcGraphUnknownDataSetSourceException' => 'Graph/exceptions/unknown_dataset_source.php',
'ezcGraphBoundings' => 'Graph/structs/boundings.php',
'ezcGraphCoordinate' => 'Graph/structs/coordinate.php',
diff --git a/src/interfaces/chart.php b/src/interfaces/chart.php
index 2411fad..0bef62b 100644
--- a/src/interfaces/chart.php
+++ b/src/interfaces/chart.php
@@ -32,7 +32,7 @@ abstract class ezcGraphChart implements ArrayAccess
/**
* Contains the data of the chart
*
- * @var array( ezcGraphDataset )
+ * @var array( ezcGraphDataSet )
*/
protected $data = array();
@@ -190,13 +190,13 @@ abstract class ezcGraphChart implements ArrayAccess
*
* @param string $name Name of dataset
* @param mixed $values Values to create dataset with
- * @throws ezcGraphTooManyDatasetExceptions
+ * @throws ezcGraphTooManyDataSetExceptions
* If too many datasets are created
- * @return ezcGraphDataset
+ * @return ezcGraphDataSet
*/
protected function addDataSet( $name, $values )
{
- $this->data[$name] = new ezcGraphDataset();
+ $this->data[$name] = new ezcGraphDataSet();
if ( is_array($values) )
{
@@ -212,7 +212,7 @@ abstract class ezcGraphChart implements ArrayAccess
}
else
{
- throw new ezcGraphUnknownDatasetSourceException( $values );
+ throw new ezcGraphUnknownDataSetSourceException( $values );
}
}
@@ -253,7 +253,7 @@ abstract class ezcGraphChart implements ArrayAccess
{
if ( !isset( $key ) )
{
- throw new ezcGraphNoSuchDatasetException( $key );
+ throw new ezcGraphNoSuchDataSetException( $key );
}
return $this->data[$key];
@@ -261,14 +261,14 @@ abstract class ezcGraphChart implements ArrayAccess
public function offsetSet( $key, $value )
{
- return $this->addDataset( $key, $value );
+ return $this->addDataSet( $key, $value );
}
public function offsetUnset( $key )
{
if ( !isset( $key ) )
{
- throw new ezcGraphNoSuchDatasetException( $key );
+ throw new ezcGraphNoSuchDataSetException( $key );
}
unset( $this->data[$key] );
diff --git a/src/interfaces/dataset_property.php b/src/interfaces/dataset_property.php
index 53a4b56..4701b11 100644
--- a/src/interfaces/dataset_property.php
+++ b/src/interfaces/dataset_property.php
@@ -1,6 +1,6 @@
<?php
/**
- * File containing the abstract ezcGraphDatasetProperty class
+ * File containing the abstract ezcGraphDataSetProperty class
*
* @package Graph
* @version //autogentag//
@@ -12,7 +12,7 @@
*
* @package Graph
*/
-abstract class ezcGraphDatasetProperty implements ArrayAccess
+abstract class ezcGraphDataSetProperty implements ArrayAccess
{
/**
* Default value for this property
@@ -32,7 +32,7 @@ abstract class ezcGraphDatasetProperty implements ArrayAccess
* Contains a reference to the dataset to check for availability of data
* keys
*
- * @var ezcGraphDataset
+ * @var ezcGraphDataSet
*/
protected $dataset;
@@ -46,7 +46,7 @@ abstract class ezcGraphDatasetProperty implements ArrayAccess
*/
abstract protected function checkValue( &$value );
- public function __construct( ezcGraphDataset $dataset )
+ public function __construct( ezcGraphDataSet $dataset )
{
$this->dataset = $dataset;
}
diff --git a/src/interfaces/element.php b/src/interfaces/element.php
index ebb06a4..1a74316 100644
--- a/src/interfaces/element.php
+++ b/src/interfaces/element.php
@@ -204,7 +204,7 @@ abstract class ezcGraphChartElement extends ezcBaseOptions
}
break;
default:
- throw new ezcGraphNoSuchDatasetException( $propertyName );
+ throw new ezcGraphNoSuchDataSetException( $propertyName );
break;
}
}
diff --git a/tests/dataset_test.php b/tests/dataset_test.php
index b333418..0ae5984 100644
--- a/tests/dataset_test.php
+++ b/tests/dataset_test.php
@@ -1,6 +1,6 @@
<?php
/**
- * ezcGraphDatasetTest
+ * ezcGraphDataSetTest
*
* @package Graph
* @version //autogen//
@@ -15,12 +15,12 @@
* @package ImageAnalysis
* @subpackage Tests
*/
-class ezcGraphDatasetTest extends ezcTestCase
+class ezcGraphDataSetTest extends ezcTestCase
{
public static function suite()
{
- return new ezcTestSuite( "ezcGraphDatasetTest" );
+ return new ezcTestSuite( "ezcGraphDataSetTest" );
}
/**
@@ -41,30 +41,30 @@ class ezcGraphDatasetTest extends ezcTestCase
{
}
- public function testCreateDatasetFromArray()
+ public function testCreateDataSetFromArray()
{
$chart = ezcGraph::create( 'Pie' );
$chart['humanoids'] = array( 'monkey' => 54, 'ape' => 37, 'human' => 9 );
$datasets = $this->getNonPublicProperty( $chart, 'data' );
$this->assertTrue(
- $datasets['humanoids'] instanceof ezcGraphDataset,
- 'No ezcGraphDataset was created.'
+ $datasets['humanoids'] instanceof ezcGraphDataSet,
+ 'No ezcGraphDataSet was created.'
);
}
- public function testGetDataset()
+ public function testGetDataSet()
{
$chart = ezcGraph::create( 'Pie' );
$chart['humanoids'] = array( 'monkey' => 54, 'ape' => 37, 'human' => 9 );
$this->assertTrue(
- $chart['humanoids'] instanceof ezcGraphDataset,
- 'No ezcGraphDataset was created.'
+ $chart['humanoids'] instanceof ezcGraphDataSet,
+ 'No ezcGraphDataSet was created.'
);
}
- public function testDatasetContent()
+ public function testDataSetContent()
{
$chart = ezcGraph::create( 'Pie' );
$chart['example'] = array( 'monkey' => 54, 2001 => 37 );
@@ -81,7 +81,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testCreateMultipleDatasetsFromArray()
+ public function testCreateMultipleDataSetsFromArray()
{
$chart = ezcGraph::create( 'Line' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -89,16 +89,16 @@ class ezcGraphDatasetTest extends ezcTestCase
$datasets = $this->getNonPublicProperty( $chart, 'data' );
$this->assertTrue(
- $datasets['income'] instanceof ezcGraphDataset,
- 'No ezcGraphDataset was created.'
+ $datasets['income'] instanceof ezcGraphDataSet,
+ 'No ezcGraphDataSet was created.'
);
$this->assertTrue(
- $datasets['spending'] instanceof ezcGraphDataset,
- 'No second ezcGraphDataset was created.'
+ $datasets['spending'] instanceof ezcGraphDataSet,
+ 'No second ezcGraphDataSet was created.'
);
}
- public function testCreateMultiplePiechartDatasetsFromArray()
+ public function testCreateMultiplePiechartDataSetsFromArray()
{
try
{
@@ -106,15 +106,15 @@ class ezcGraphDatasetTest extends ezcTestCase
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
$chart['spending'] = array( 2000 => 2347.2, 2458.3, 2569.4 );
}
- catch ( ezcGraphTooManyDatasetsExceptions $e )
+ catch ( ezcGraphTooManyDataSetsExceptions $e )
{
return true;
}
- $this->fail( 'Expected ezcGraphTooManyDatasetsExceptions.' );
+ $this->fail( 'Expected ezcGraphTooManyDataSetsExceptions.' );
}
- public function testDatasetLabel()
+ public function testDataSetLabel()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -125,7 +125,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetLabel()
+ public function testDataSetSetLabel()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -137,7 +137,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetColor()
+ public function testDataSetSetColor()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -149,7 +149,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetHighlight()
+ public function testDataSetSetHighlight()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -161,7 +161,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetGetHighlight()
+ public function testDataSetGetHighlight()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -177,7 +177,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetHighlightSingle()
+ public function testDataSetSetHighlightSingle()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -194,7 +194,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetSingleColor()
+ public function testDataSetSetSingleColor()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -206,7 +206,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetSingleSymbol()
+ public function testDataSetSetSingleSymbol()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -218,7 +218,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetPropertyValueFallback()
+ public function testDataSetPropertyValueFallback()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -230,7 +230,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetNonexistingSingle()
+ public function testDataSetSetNonexistingSingle()
{
try
{
@@ -246,7 +246,7 @@ class ezcGraphDatasetTest extends ezcTestCase
$this->fail( 'Expected ezcGraphNoSuchDataException.' );
}
- public function testDatasetGetSingleData()
+ public function testDataSetGetSingleData()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
@@ -257,7 +257,7 @@ class ezcGraphDatasetTest extends ezcTestCase
);
}
- public function testDatasetSetSingleData()
+ public function testDataSetSetSingleData()
{
$chart = ezcGraph::create( 'Pie' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
diff --git a/tests/numeric_axis_test.php b/tests/numeric_axis_test.php
index f5b7a28..e9a7d9a 100644
--- a/tests/numeric_axis_test.php
+++ b/tests/numeric_axis_test.php
@@ -578,7 +578,7 @@ class ezcGraphNumericAxisTest extends ezcTestCase
);
}
- public function testNullPositionMultipleDatasets()
+ public function testNullPositionMultipleDataSets()
{
$chart = ezcGraph::create( 'Line' );
$chart['sampleData'] = array( 'sample 1' => 234, 'sample 2' => -21, 'sample 3' => 324, 'sample 4' => 120, 'sample 5' => 1);
diff --git a/tests/palette_test.php b/tests/palette_test.php
index 5ed820f..c1ee41d 100644
--- a/tests/palette_test.php
+++ b/tests/palette_test.php
@@ -129,55 +129,55 @@ class ezcGraphPaletteTest extends ezcTestCase
$this->assertEquals(
ezcGraphColor::fromHex( '#3465A4' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#4E9A06' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#CC0000' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#EDD400' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#75505B' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#F57900' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#204A87' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#C17D11' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
$this->assertEquals(
ezcGraphColor::fromHex( '#3465A4' ),
$chart->palette->dataSetColor,
- 'Dataset color not properly set.'
+ 'DataSet color not properly set.'
);
}
@@ -286,7 +286,7 @@ class ezcGraphPaletteTest extends ezcTestCase
);
}
- public function testDatasetAutomaticColorization()
+ public function testDataSetAutomaticColorization()
{
$chart = ezcGraph::create( 'Line' );
$chart['income'] = array( 2000 => 2345.2, 2456.3, 2567.4 );
diff --git a/tests/renderer_2d_test.php b/tests/renderer_2d_test.php
index 79ea7c5..f1e3c1d 100644
--- a/tests/renderer_2d_test.php
+++ b/tests/renderer_2d_test.php
@@ -1107,7 +1107,7 @@ class ezcGraphRenderer2dTest extends ezcImageTestCase
$chart['evenMoreData'],
);
- $chart->legend->generateFromDatasets( $datasets );
+ $chart->legend->generateFromDataSets( $datasets );
$this->driver
->expects( $this->at( 0 ) )
@@ -1174,7 +1174,7 @@ class ezcGraphRenderer2dTest extends ezcImageTestCase
$chart['evenMoreData'],
);
- $chart->legend->generateFromDatasets( $datasets );
+ $chart->legend->generateFromDataSets( $datasets );
$this->driver
->expects( $this->at( 1 ) )
@@ -1232,7 +1232,7 @@ class ezcGraphRenderer2dTest extends ezcImageTestCase
$chart['evenMoreData'],
);
- $chart->legend->generateFromDatasets( $datasets );
+ $chart->legend->generateFromDataSets( $datasets );
$this->driver
->expects( $this->at( 0 ) )
@@ -1300,7 +1300,7 @@ class ezcGraphRenderer2dTest extends ezcImageTestCase
$chart['evenMoreData'],
);
- $chart->legend->generateFromDatasets( $datasets );
+ $chart->legend->generateFromDataSets( $datasets );
$this->driver
->expects( $this->at( 1 ) )
diff --git a/tests/suite.php b/tests/suite.php
index cb4f433..9fc1a1a 100644
--- a/tests/suite.php
+++ b/tests/suite.php
@@ -53,7 +53,7 @@ class ezcGraphSuite extends ezcTestSuite
$this->addTest( ezcGraphChartTest::suite() );
$this->addTest( ezcGraphPieChartTest::suite() );
$this->addTest( ezcGraphLineChartTest::suite() );
- $this->addTest( ezcGraphDatasetTest::suite() );
+ $this->addTest( ezcGraphDataSetTest::suite() );
$this->addTest( ezcGraphLegendTest::suite() );
$this->addTest( ezcGraphNumericAxisTest::suite() );
$this->addTest( ezcGraphLabeledAxisTest::suite() );
OpenPOWER on IntegriCloud