From 0a4fa4a25a19282fbc2271ca7918d54e04df1ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 19 Jun 2012 11:03:01 +0200 Subject: [PATCH] Fix some coding standard violations --- test/classes/gis/PMA_GIS_Geometry_test.php | 13 +-- .../gis/PMA_GIS_Geometrycollection_test.php | 77 +++++++++++------- test/classes/gis/PMA_GIS_Linestring_test.php | 64 ++++++++------- .../gis/PMA_GIS_Multilinestring_test.php | 66 ++++++++------- test/classes/gis/PMA_GIS_Multipoint_test.php | 66 ++++++++------- .../classes/gis/PMA_GIS_Multipolygon_test.php | 66 ++++++++------- test/classes/gis/PMA_GIS_Point_test.php | 66 ++++++++------- test/classes/gis/PMA_GIS_Polygon_test.php | 81 ++++++++++--------- 8 files changed, 272 insertions(+), 227 deletions(-) diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php index d27aa068ae95..d4e5b91228e5 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/PMA_GIS_Geometry_test.php @@ -265,7 +265,8 @@ public function testGetBoundsForOl($srid, $scale_data, $output){ ); } - public function providerForTestGetBoundsForOl() { + public function providerForTestGetBoundsForOl() + { return array( array( @@ -278,7 +279,7 @@ public function providerForTestGetBoundsForOl() { ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));' ) - + ); } @@ -300,16 +301,16 @@ public function testGetPolygonArrayForOpenLayers($polygons, $srid, $output){ $output ); } - + public function providerForTestGetPolygonArrayForOpenLayers(){ - + return array( - array( + array( array('Triangle'), 4326, 'new Array(new OpenLayers.Geometry.Polygon(new Array(new OpenLayers.Geometry.LinearRing(new Array((new OpenLayers.Geometry.Point(,)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))))))' ) - + ); } diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/PMA_GIS_Geometrycollection_test.php index 813b0be9f596..569d4845a924 100644 --- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php +++ b/test/classes/gis/PMA_GIS_Geometrycollection_test.php @@ -13,8 +13,11 @@ /** * Tests for PMA_GIS_Geometrycollection class + * + * @package PhpMyAdmin-test */ -class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase { +class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase +{ /** * @access protected @@ -28,7 +31,8 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase { * @access protected * @return void */ - protected function setUp() { + protected function setUp() + { $this->object = PMA_GIS_Geometrycollection::singleton(); } @@ -39,22 +43,25 @@ protected function setUp() { * @access protected * @return void */ - protected function tearDown() { + protected function tearDown() + { unset($this->object); } /** * - * @param type $spatial - * + * @param type $spatial + * * @dataProvider providerForScaleRow */ - public function testScaleRow($spatial, $output) { + public function testScaleRow($spatial, $output) + { $this->assertEquals($this->object->scaleRow($spatial), $output); } - public function providerForScaleRow() { + public function providerForScaleRow() + { return array( array( @@ -74,16 +81,18 @@ public function providerForScaleRow() { * @param type $gis_data * @param type $index * @param string $empty - * @param type $output - * + * @param type $output + * * @dataProvider providerForGenerateWkt */ - public function testGenerateWkt($gis_data, $index, $empty, $output) { + public function testGenerateWkt($gis_data, $index, $empty, $output) + { $this->assertEquals($this->object->generateWkt($gis_data, $index, $empty = ''), $output); } - public function providerForGenerateWkt() { + public function providerForGenerateWkt() + { $temp1 = array( 0 => array( @@ -112,12 +121,14 @@ public function providerForGenerateWkt() { * * @dataProvider providerForGenerateParams */ - public function testGenerateParams($value, $output) { + public function testGenerateParams($value, $output) + { $this->assertEquals($this->object->generateParams($value), $output); } - public function providerForGenerateParams() { + public function providerForGenerateParams() + { return array( array( @@ -153,17 +164,19 @@ public function providerForGenerateParams() { * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * * @dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - public function providerForPrepareRowAsPng() { + public function providerForPrepareRowAsPng() + { return array( array( @@ -189,16 +202,18 @@ public function providerForPrepareRowAsPng() { * @param type $line_color * @param type $scale_data * @param type $pdf - * + * * @dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - public function providerForPrepareRowAsPdf() { + public function providerForPrepareRowAsPdf() + { return array( array( @@ -222,18 +237,20 @@ public function providerForPrepareRowAsPdf() { * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - * @dataProvider providerForPrepareRowAsSvg + * @param type $output + * + * @dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data); $this->assertEquals(1, preg_match($output, $string)); // $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - public function providerForPrepareRowAsSvg() { + public function providerForPrepareRowAsSvg() + { return array( array( @@ -258,16 +275,18 @@ public function providerForPrepareRowAsSvg() { * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * * @dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data), $output); } - public function providerForPrepareRowAsOl() { + public function providerForPrepareRowAsOl() + { return array( array( diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php index 82041d9b70e5..cbd00e52299e 100644 --- a/test/classes/gis/PMA_GIS_Linestring_test.php +++ b/test/classes/gis/PMA_GIS_Linestring_test.php @@ -162,7 +162,7 @@ public function providerForTestScaleRow() ) ); } - + /** * * @param type $spatial @@ -170,18 +170,19 @@ public function providerForTestScaleRow() * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { - + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { + $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - + public function providerForPrepareRowAsPng(){ - + return array( array( 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -196,7 +197,7 @@ public function providerForPrepareRowAsPng(){ imagecreatetruecolor('120','150'), '' ) - + ); } @@ -207,17 +208,18 @@ public function providerForPrepareRowAsPng(){ * @param type $line_color * @param type $scale_data * @param type $pdf - * + * *@dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { + $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - + public function providerForPrepareRowAsPdf(){ - + return array( array( 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -230,29 +232,30 @@ public function providerForPrepareRowAsPdf(){ 'height' => 150 ), new TCPDF(), - ) + ) ); } - + /** * * @param type $spatial * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - *@dataProvider providerForPrepareRowAsSvg + * @param type $output + * + *@dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { + $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data); $this->assertEquals(1, preg_match($output, $string)); //$this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsSvg(){ - + return array( array( 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -265,7 +268,7 @@ public function providerForPrepareRowAsSvg(){ 'height' => 150 ), '/^()$/' - ) + ) ); } @@ -276,17 +279,18 @@ public function providerForPrepareRowAsSvg(){ * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsOl(){ - + return array( array( 'LINESTRING(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -300,7 +304,7 @@ public function providerForPrepareRowAsOl(){ 'maxY' => '1', ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(new Array((new OpenLayers.Geometry.Point(12,35)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(48,75)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(69,23)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(25,45)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(14,53)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(35,78)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))), null, {"strokeColor":"#B02EE0","strokeWidth":2,"label":"Ol","fontSize":10}));' - ) + ) ); } } diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index bf927ea93c28..e3d7435c888d 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -222,8 +222,8 @@ public function providerForTestScaleRow() ) ); } - - + + /** * * @param type $spatial @@ -231,18 +231,19 @@ public function providerForTestScaleRow() * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { - + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { + $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - + public function providerForPrepareRowAsPng(){ - + return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -257,7 +258,7 @@ public function providerForPrepareRowAsPng(){ imagecreatetruecolor('120','150'), '' ) - + ); } @@ -268,17 +269,18 @@ public function providerForPrepareRowAsPng(){ * @param type $line_color * @param type $scale_data * @param type $pdf - * + * *@dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { + $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - + public function providerForPrepareRowAsPdf(){ - + return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -291,29 +293,30 @@ public function providerForPrepareRowAsPdf(){ 'height' => 150 ), new TCPDF(), - ) + ) ); } - + /** * * @param type $spatial * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - *@dataProvider providerForPrepareRowAsSvg + * @param type $output + * + *@dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { + $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data); $this->assertEquals(1, preg_match($output, $string)); //$this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsSvg(){ - + return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -326,7 +329,7 @@ public function providerForPrepareRowAsSvg(){ 'height' => 150 ), '/^()$/' - ) + ) ); } @@ -337,17 +340,18 @@ public function providerForPrepareRowAsSvg(){ * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsOl(){ - + return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -361,7 +365,7 @@ public function providerForPrepareRowAsOl(){ 'maxY' => '1', ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(new Array(new OpenLayers.Geometry.LineString(new Array((new OpenLayers.Geometry.Point(36,14)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(47,23)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(62,75)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))), new OpenLayers.Geometry.LineString(new Array((new OpenLayers.Geometry.Point(36,10)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(17,23)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(178,53)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))))), null, {"strokeColor":"#B02EE0","strokeWidth":2,"label":"Ol","fontSize":10}));' - ) + ) ); } } diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php index 185379a11aa3..160bcd6f87e8 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/PMA_GIS_Multipoint_test.php @@ -166,8 +166,8 @@ public function providerForTestScaleRow() ) ); } - - + + /** * * @param type $spatial @@ -175,18 +175,19 @@ public function providerForTestScaleRow() * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { - + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { + $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - + public function providerForPrepareRowAsPng(){ - + return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -201,7 +202,7 @@ public function providerForPrepareRowAsPng(){ imagecreatetruecolor('120','150'), '' ) - + ); } @@ -212,17 +213,18 @@ public function providerForPrepareRowAsPng(){ * @param type $line_color * @param type $scale_data * @param type $pdf - * + * *@dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { + $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - + public function providerForPrepareRowAsPdf(){ - + return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -235,29 +237,30 @@ public function providerForPrepareRowAsPdf(){ 'height' => 150 ), new TCPDF(), - ) + ) ); } - + /** * * @param type $spatial * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - *@dataProvider providerForPrepareRowAsSvg + * @param type $output + * + *@dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { + $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data); $this->assertEquals(1, preg_match($output, $string)); // $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsSvg(){ - + return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -270,7 +273,7 @@ public function providerForPrepareRowAsSvg(){ 'height' => 150 ), '/^()$/' - ) + ) ); } @@ -281,17 +284,18 @@ public function providerForPrepareRowAsSvg(){ * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsOl(){ - + return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -305,7 +309,7 @@ public function providerForPrepareRowAsOl(){ 'maxY' => '1', ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(new Array((new OpenLayers.Geometry.Point(12,35)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(48,75)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(69,23)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(25,45)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(14,53)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(35,78)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))), null, {"pointRadius":3,"fillColor":"#ffffff","strokeColor":"#B02EE0","strokeWidth":2,"label":"Ol","labelYOffset":-8,"fontSize":10}));' - ) + ) ); } } diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 609c19665d02..f68b8438b4d5 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -260,8 +260,8 @@ public function providerForTestScaleRow() ) ); } - - + + /** * * @param type $spatial @@ -269,18 +269,19 @@ public function providerForTestScaleRow() * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { - + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { + $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - + public function providerForPrepareRowAsPng(){ - + return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -295,7 +296,7 @@ public function providerForPrepareRowAsPng(){ imagecreatetruecolor('120','150'), '' ) - + ); } @@ -306,17 +307,18 @@ public function providerForPrepareRowAsPng(){ * @param type $line_color * @param type $scale_data * @param type $pdf - * + * *@dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { + $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - + public function providerForPrepareRowAsPdf(){ - + return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -329,29 +331,30 @@ public function providerForPrepareRowAsPdf(){ 'height' => 150 ), new TCPDF(), - ) + ) ); } - + /** * * @param type $spatial * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - *@dataProvider providerForPrepareRowAsSvg + * @param type $output + * + *@dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { + $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data); $this->assertEquals(1, preg_match($output, $string)); // $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsSvg(){ - + return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -364,7 +367,7 @@ public function providerForPrepareRowAsSvg(){ 'height' => 150 ), '/^()$/' - ) + ) ); } @@ -375,17 +378,18 @@ public function providerForPrepareRowAsSvg(){ * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsOl(){ - + return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -399,7 +403,7 @@ public function providerForPrepareRowAsOl(){ 'maxY' => '1', ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(new Array(new OpenLayers.Geometry.Polygon(new Array(new OpenLayers.Geometry.LinearRing(new Array((new OpenLayers.Geometry.Point(136,40)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(147,83)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(16,75)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(136,40)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))))), new OpenLayers.Geometry.Polygon(new Array(new OpenLayers.Geometry.LinearRing(new Array((new OpenLayers.Geometry.Point(105,0)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(56,20)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(78,73)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(105,0)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))))))), null, {"strokeColor":"#000000","strokeWidth":0.5,"fillColor":"#B02EE0","fillOpacity":0.8,"label":"Ol","fontSize":10}));' - ) + ) ); } } diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php index e7f6a4014836..fd17bde24926 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/PMA_GIS_Point_test.php @@ -168,8 +168,8 @@ public function providerForTestScaleRow() ) ); } - - + + /** * * @param type $spatial @@ -177,18 +177,19 @@ public function providerForTestScaleRow() * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { - + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { + $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - + public function providerForPrepareRowAsPng(){ - + return array( array( 'POINT(12 35)', @@ -203,7 +204,7 @@ public function providerForPrepareRowAsPng(){ imagecreatetruecolor('120','150'), '' ) - + ); } @@ -214,17 +215,18 @@ public function providerForPrepareRowAsPng(){ * @param type $line_color * @param type $scale_data * @param type $pdf - * + * *@dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { + $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - + public function providerForPrepareRowAsPdf(){ - + return array( array( 'POINT(12 35)', @@ -237,28 +239,29 @@ public function providerForPrepareRowAsPdf(){ 'height' => 150 ), new TCPDF(), - ) + ) ); } - + /** * * @param type $spatial * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - *@dataProvider providerForPrepareRowAsSvg + * @param type $output + * + *@dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($output, $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data)); // $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsSvg(){ - + return array( array( 'POINT(12 35)', @@ -271,7 +274,7 @@ public function providerForPrepareRowAsSvg(){ 'height' => 150 ), '' - ) + ) ); } @@ -282,17 +285,18 @@ public function providerForPrepareRowAsSvg(){ * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsOl(){ - + return array( array( 'POINT(12 35)', @@ -306,7 +310,7 @@ public function providerForPrepareRowAsOl(){ 'maxY' => '1', ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feature.Vector((new OpenLayers.Geometry.Point(12,35)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), null, {"pointRadius":3,"fillColor":"#ffffff","strokeColor":"#B02EE0","strokeWidth":2,"label":"Ol","labelYOffset":-8,"fontSize":10}));' - ) + ) ); } } diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index b0cebaa5697a..4176407f73cb 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/PMA_GIS_Polygon_test.php @@ -348,8 +348,8 @@ public function providerForTestScaleRow() ), ); } - - + + /** * * @param type $spatial @@ -357,18 +357,19 @@ public function providerForTestScaleRow() * @param type $line_color * @param type $scale_data * @param type $image - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsPng */ - public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) { - + public function testPrepareRowAsPng($spatial, $label, $line_color, $scale_data, $image, $output) + { + $return = $this->object->prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image); $this->assertTrue(true); } - + public function providerForPrepareRowAsPng(){ - + return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -383,7 +384,7 @@ public function providerForPrepareRowAsPng(){ imagecreatetruecolor('120','150'), '' ) - + ); } @@ -394,17 +395,18 @@ public function providerForPrepareRowAsPng(){ * @param type $line_color * @param type $scale_data * @param type $pdf - * + * *@dataProvider providerForPrepareRowAsPdf */ - public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - + public function testPrepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) + { + $return = $this->object->prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf); $this->assertTrue($return instanceof TCPDF); } - + public function providerForPrepareRowAsPdf(){ - + return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -417,29 +419,30 @@ public function providerForPrepareRowAsPdf(){ 'height' => 150 ), new TCPDF(), - ) + ) ); } - + /** * * @param type $spatial * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * - *@dataProvider providerForPrepareRowAsSvg + * @param type $output + * + *@dataProvider providerForPrepareRowAsSvg */ - public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsSvg($spatial, $label, $line_color, $scale_data, $output) + { + $string = $this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data); $this->assertEquals(1, preg_match($output, $string)); // $this->assertEquals($this->object->prepareRowAsSvg($spatial, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsSvg(){ - + return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -452,7 +455,7 @@ public function providerForPrepareRowAsSvg(){ 'height' => 150 ), '/^()$/' - ) + ) ); } @@ -463,17 +466,18 @@ public function providerForPrepareRowAsSvg(){ * @param type $label * @param type $line_color * @param type $scale_data - * @param type $output - * + * @param type $output + * *@dataProvider providerForPrepareRowAsOl */ - public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) { - + public function testPrepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data, $output) + { + $this->assertEquals($this->object->prepareRowAsOl($spatial, $srid, $label, $line_color, $scale_data) , $output); } - + public function providerForPrepareRowAsOl(){ - + return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -487,24 +491,25 @@ public function providerForPrepareRowAsOl(){ 'maxY' => '1', ), 'bound = new OpenLayers.Bounds(); bound.extend(new OpenLayers.LonLat(0, 0).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject())); bound.extend(new OpenLayers.LonLat(1, 1).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()));vectorLayer.addFeatures(new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(new Array(new OpenLayers.Geometry.LinearRing(new Array((new OpenLayers.Geometry.Point(123,0)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(23,30)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(17,63)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()), (new OpenLayers.Geometry.Point(123,0)).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject()))))), null, {"strokeColor":"#000000","strokeWidth":0.5,"fillColor":"#B02EE0","fillOpacity":0.8,"label":"Ol","fontSize":10}));' - ) + ) ); } /** * * @param type $ring - * @param type $output - * + * @param type $output + * *@dataProvider providerForIsOuterRing */ - public function testIsOuterRing($ring) { - + public function testIsOuterRing($ring) + { + $this->assertTrue($this->object->isOuterRing($ring)); } - + public function providerForIsOuterRing(){ - + return array( array( array( @@ -513,7 +518,7 @@ public function providerForIsOuterRing(){ array('x' => 1, 'y' => 1), array('x' => 1, 'y' => 0) ), - ) + ) ); } }