From 7076789332891cd2c2e4645bd6da578a3acfd366 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 18 Sep 2012 22:02:08 +0530 Subject: [PATCH] Remove some extraneous new lines --- test/classes/gis/PMA_GIS_Geometry_test.php | 4 -- .../gis/PMA_GIS_Geometrycollection_test.php | 42 ++++++------------- .../gis/PMA_GIS_Multilinestring_test.php | 9 ---- test/classes/gis/PMA_GIS_Multipoint_test.php | 9 ---- .../classes/gis/PMA_GIS_Multipolygon_test.php | 8 ---- test/classes/gis/PMA_GIS_Point_test.php | 10 ----- test/classes/gis/PMA_GIS_Polygon_test.php | 12 ------ 7 files changed, 12 insertions(+), 82 deletions(-) diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php index 029d8f2b93..41c1d1c556 100644 --- a/test/classes/gis/PMA_GIS_Geometry_test.php +++ b/test/classes/gis/PMA_GIS_Geometry_test.php @@ -256,7 +256,6 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase */ public function testGetBoundsForOl($srid, $scale_data, $output) { - $this->assertEquals( $this->_callProtectedFunction( 'getBoundsForOl', @@ -268,7 +267,6 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase public function providerForTestGetBoundsForOl() { - return array( array( 4326, @@ -294,7 +292,6 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase */ public function testGetPolygonArrayForOpenLayers($polygons, $srid, $output) { - $this->assertEquals( $this->_callProtectedFunction( 'getPolygonArrayForOpenLayers', @@ -306,7 +303,6 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase public function providerForTestGetPolygonArrayForOpenLayers() { - return array( array( array('Triangle'), diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/PMA_GIS_Geometrycollection_test.php index 7b7e640fc9..b207262bc9 100644 --- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php +++ b/test/classes/gis/PMA_GIS_Geometrycollection_test.php @@ -60,13 +60,11 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase */ public function testScaleRow($spatial, $output) { - $this->assertEquals($output, $this->object->scaleRow($spatial)); } public function providerForScaleRow() { - return array( array( 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', @@ -94,7 +92,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase */ public function testGenerateWkt($gis_data, $index, $empty, $output) { - $this->assertEquals( $output, $this->object->generateWkt($gis_data, $index, $empty = '') @@ -103,7 +100,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function providerForGenerateWkt() { - $temp1 = array( 0 => array( 'gis_type' => 'LINESTRING', @@ -137,35 +133,31 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase */ public function testGenerateParams($value, $output) { - $this->assertEquals($output, $this->object->generateParams($value)); } public function providerForGenerateParams() { - return array( array( 'GEOMETRYCOLLECTION(LINESTRING(5.02 8.45,6.14 0.15))', array( 'srid' => 0, 'GEOMETRYCOLLECTION' => Array('geom_count' => 1), - - '0' => Array( - 'gis_type' => 'LINESTRING', - 'LINESTRING' => Array( - 'no_of_points' => 2, - '0' => Array( - 'x' => 5.02, - 'y' => 8.45 - ), - '1' => Array( - 'x' => 6.14, - 'y' => 0.15 + '0' => Array( + 'gis_type' => 'LINESTRING', + 'LINESTRING' => Array( + 'no_of_points' => 2, + '0' => Array( + 'x' => 5.02, + 'y' => 8.45 + ), + '1' => Array( + 'x' => 6.14, + 'y' => 0.15 + ) ) ) - - ) ), ), ); @@ -188,7 +180,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function testPrepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image, $output ) { - $return = $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); @@ -198,7 +189,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function providerForPrepareRowAsPng() { - return array( array( 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', @@ -232,7 +222,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function testPrepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ) { - $return = $this->object->prepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ); @@ -241,7 +230,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function providerForPrepareRowAsPdf() { - return array( array( 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', @@ -274,7 +262,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function testPrepareRowAsSvg( $spatial, $label, $line_color, $scale_data, $output ) { - $string = $this->object->prepareRowAsSvg( $spatial, $label, $line_color, $scale_data ); @@ -289,7 +276,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function providerForPrepareRowAsSvg() { - return array( array( 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', @@ -323,7 +309,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function testPrepareRowAsOl( $spatial, $srid, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsOl( @@ -334,7 +319,6 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase public function providerForPrepareRowAsOl() { - return array( array( 'GEOMETRYCOLLECTION(POLYGON((35 10,10 20,15 40,45 45,35 10),(20 30,35 32,30 20,20 30)))', @@ -351,7 +335,5 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase ) ); } - } - ?> diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php index f9f70ef257..21bff595c5 100644 --- a/test/classes/gis/PMA_GIS_Multilinestring_test.php +++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php @@ -238,7 +238,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function testPrepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image, $output ) { - $return = $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); @@ -248,7 +247,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPng() { - return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -263,7 +261,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest imagecreatetruecolor('120', '150'), '' ) - ); } @@ -280,7 +277,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function testPrepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ) { - $return = $this->object->prepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ); @@ -289,7 +285,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPdf() { - return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -319,7 +314,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function testPrepareRowAsSvg( $spatial, $label, $line_color, $scale_data, $output ) { - $string = $this->object->prepareRowAsSvg( $spatial, $label, $line_color, $scale_data ); @@ -328,7 +322,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsSvg() { - return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', @@ -359,7 +352,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function testPrepareRowAsOl( $spatial, $srid, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsOl( @@ -370,7 +362,6 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsOl() { - return array( array( 'MULTILINESTRING((36 14,47 23,62 75),(36 10,17 23,178 53))', diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php index 251b0a12fe..e9250d9963 100644 --- a/test/classes/gis/PMA_GIS_Multipoint_test.php +++ b/test/classes/gis/PMA_GIS_Multipoint_test.php @@ -182,7 +182,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function testPrepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image, $output ) { - $return = $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); @@ -192,7 +191,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPng() { - return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -207,7 +205,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest imagecreatetruecolor('120', '150'), '' ) - ); } @@ -224,7 +221,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function testPrepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ) { - $return = $this->object->prepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ); @@ -233,7 +229,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPdf() { - return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -263,7 +258,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function testPrepareRowAsSvg( $spatial, $label, $line_color, $scale_data, $output ) { - $string = $this->object->prepareRowAsSvg( $spatial, $label, $line_color, $scale_data ); @@ -272,7 +266,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsSvg() { - return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', @@ -303,7 +296,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function testPrepareRowAsOl( $spatial, $srid, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsOl( @@ -314,7 +306,6 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsOl() { - return array( array( 'MULTIPOINT(12 35,48 75,69 23,25 45,14 53,35 78)', diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php index 739cfe7d53..c59d2536d3 100644 --- a/test/classes/gis/PMA_GIS_Multipolygon_test.php +++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php @@ -276,7 +276,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image, $output ) { - $return = $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); @@ -286,7 +285,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPng() { - return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -318,7 +316,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ) { - $return = $this->object->prepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ); @@ -327,7 +324,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPdf() { - return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -357,7 +353,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsSvg( $spatial, $label, $line_color, $scale_data, $output ) { - $string = $this->object->prepareRowAsSvg( $spatial, $label, $line_color, $scale_data ); @@ -366,7 +361,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsSvg() { - return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', @@ -397,7 +391,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsOl( $spatial, $srid, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsOl( @@ -408,7 +401,6 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsOl() { - return array( array( 'MULTIPOLYGON(((136 40,147 83,16 75,136 40)),((105 0,56 20,78 73,105 0)))', diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php index 611401a800..f05b05c1ca 100644 --- a/test/classes/gis/PMA_GIS_Point_test.php +++ b/test/classes/gis/PMA_GIS_Point_test.php @@ -169,7 +169,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest ); } - /** * * @param type $spatial @@ -184,7 +183,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function testPrepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image, $output ) { - $return = $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); @@ -194,7 +192,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPng() { - return array( array( 'POINT(12 35)', @@ -209,7 +206,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest imagecreatetruecolor('120', '150'), '' ) - ); } @@ -226,7 +222,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function testPrepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ) { - $return = $this->object->prepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ); @@ -235,7 +230,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPdf() { - return array( array( 'POINT(12 35)', @@ -265,7 +259,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function testPrepareRowAsSvg( $spatial, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsSvg( @@ -276,7 +269,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsSvg() { - return array( array( 'POINT(12 35)', @@ -307,7 +299,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function testPrepareRowAsOl( $spatial, $srid, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsOl( @@ -318,7 +309,6 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsOl() { - return array( array( 'POINT(12 35)', diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php index 7596d9728f..40d8ea2c52 100644 --- a/test/classes/gis/PMA_GIS_Polygon_test.php +++ b/test/classes/gis/PMA_GIS_Polygon_test.php @@ -349,7 +349,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest ); } - /** * * @param type $spatial @@ -364,7 +363,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image, $output ) { - $return = $this->object->prepareRowAsPng( $spatial, $label, $line_color, $scale_data, $image ); @@ -374,7 +372,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPng() { - return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -389,7 +386,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest imagecreatetruecolor('120', '150'), '' ) - ); } @@ -406,7 +402,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ) { - $return = $this->object->prepareRowAsPdf( $spatial, $label, $line_color, $scale_data, $pdf ); @@ -415,7 +410,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsPdf() { - return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -445,7 +439,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsSvg( $spatial, $label, $line_color, $scale_data, $output ) { - $string = $this->object->prepareRowAsSvg( $spatial, $label, $line_color, $scale_data ); @@ -454,7 +447,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsSvg() { - return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -485,7 +477,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function testPrepareRowAsOl( $spatial, $srid, $label, $line_color, $scale_data, $output ) { - $this->assertEquals( $output, $this->object->prepareRowAsOl( @@ -496,7 +487,6 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest public function providerForPrepareRowAsOl() { - return array( array( 'POLYGON((123 0,23 30,17 63,123 0))', @@ -523,13 +513,11 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest */ public function testIsOuterRing($ring) { - $this->assertTrue($this->object->isOuterRing($ring)); } public function providerForIsOuterRing() { - return array( array( array(