Skip to content

Commit

Permalink
Fix some coding standard violations
Browse files Browse the repository at this point in the history
  • Loading branch information
@nijel
nijel committed Jun 19, 2012
1 parent 26feda2 commit 0a4fa4a
Show file tree
Hide file tree
Showing 8 changed files with 272 additions and 227 deletions.
13 changes: 7 additions & 6 deletions test/classes/gis/PMA_GIS_Geometry_test.php
View file
Expand Up @@ -265,7 +265,8 @@ public function testGetBoundsForOl($srid, $scale_data, $output){
);
}

public function providerForTestGetBoundsForOl() {
public function providerForTestGetBoundsForOl()
{

return array(
array(
Expand All @@ -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()));'
)

);
}

Expand All @@ -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()))))))'
)

);
}

Expand Down
77 changes: 48 additions & 29 deletions test/classes/gis/PMA_GIS_Geometrycollection_test.php
View file
Expand Up @@ -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
Expand All @@ -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();
}

Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down
64 changes: 34 additions & 30 deletions test/classes/gis/PMA_GIS_Linestring_test.php
View file
Expand Up @@ -162,26 +162,27 @@ public function providerForTestScaleRow()
)
);
}

/**
*
* @param type $spatial
* @param type $label
* @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)',
Expand All @@ -196,7 +197,7 @@ public function providerForPrepareRowAsPng(){
imagecreatetruecolor('120','150'),
''
)

);
}

Expand All @@ -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)',
Expand All @@ -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)',
Expand All @@ -265,7 +268,7 @@ public function providerForPrepareRowAsSvg(){
'height' => 150
),
'/^(<polyline points="0,218 72,138 114,242 26,198 4,182 46,132 " name="svg" id="svg)(\d+)(" class="linestring vector" fill="none" stroke="#B02EE0" stroke-width="2"\/>)$/'
)
)
);
}

Expand All @@ -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)',
Expand All @@ -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}));'
)
)
);
}
}
Expand Down

0 comments on commit 0a4fa4a

Please sign in to comment.