gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2012-09-04 21:38:00 +05:30
commit ba2ebd43fd
115 changed files with 62178 additions and 61634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
import.php
View File

@ -91,7 +91,11 @@ if (! empty($sql_query)) {
// upload limit has been reached, let's assume the second possibility.
;
if ($_POST == array() && $_GET == array()) {
$message = PMA_Message::error(__('You probably tried to upload too large file. Please refer to %sdocumentation%s for ways to workaround this limit.'));
$message = PMA_Message::error(
__('You probably tried to upload a file that is too large.'
. ' Please refer to %sdocumentation%s for a workaround for this limit.'
)
);
$message->addParam('[a@./Documentation.html#faq1_16@_blank]');
$message->addParam('[/a]');

3
index.php
View File

@ -114,7 +114,8 @@ $response->disable();
var frame_content = 0;
var frame_navigation = 0;
function getFrames() {
function getFrames()
{
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
frame_content = window.frames[1];
frame_navigation = window.frames[0];

62
js/server_status_monitor.js
View File

@ -81,7 +81,8 @@ $(function() {
nodes: [ {
dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}],
transformFn: 'qce'
} ]
} ],
maxYLabel: []
},
// Query cache usage
'qcu': {
@ -92,7 +93,8 @@ $(function() {
nodes: [ {
dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}],
transformFn: 'qcu'
} ]
} ],
maxYLabel: []
}
};
@ -107,7 +109,8 @@ $(function() {
} ],
nodes: [ {
dataPoints: [{ type: 'cpu', name: 'loadavg'}]
} ]
} ],
maxYLabel: []
},
'memory': {
@ -124,7 +127,8 @@ $(function() {
} ],
nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 }
]
],
maxYLabel: []
},
'swap': {
@ -140,7 +144,8 @@ $(function() {
} ],
nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }]},
{ dataPoints: [{ type: 'memory', name: 'SwapUsed' }]}
]
],
maxYLabel: []
}
});
break;
@ -152,7 +157,8 @@ $(function() {
series: [ {
label: PMA_messages['strAverageLoad']
} ],
nodes: [{ dataPoints: [{ type: 'cpu', name: 'irrelevant' }], transformFn: 'cpu-linux'}]
nodes: [{ dataPoints: [{ type: 'cpu', name: 'irrelevant' }], transformFn: 'cpu-linux'}],
maxYLabel: []
},
'memory': {
title: PMA_messages['strSystemMemory'],
@ -167,7 +173,8 @@ $(function() {
{ dataPoints: [{ type: 'memory', name: 'Cached' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'MemFree' }], valueDivisor: 1024 }
]
],
maxYLabel: []
},
'swap': {
title: PMA_messages['strSystemSwap'],
@ -180,7 +187,8 @@ $(function() {
{ dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024 },
{ dataPoints: [{ type: 'memory', name: 'SwapFree' }], valueDivisor: 1024 }
]
],
maxYLabel: []
}
});
break;
@ -190,7 +198,8 @@ $(function() {
defaultChartGrid = {
'c0': { title: PMA_messages['strQuestions'],
series: [{label: PMA_messages['strQuestions']}],
nodes: [{dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }]
nodes: [{dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }],
maxYLabel: []
},
'c1': {
title: PMA_messages['strChartConnectionsTitle'],
@ -198,7 +207,8 @@ $(function() {
{ label: PMA_messages['strProcesses']} ],
nodes: [ { dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' },
{ dataPoints: [{ type: 'proc', name: 'processes' }] }
]
],
maxYLabel: []
},
'c2': {
title: PMA_messages['strTraffic'],
@ -209,7 +219,8 @@ $(function() {
nodes: [
{ dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024 },
{ dataPoints: [{ type: 'statusvar', name: 'Bytes_received' }], display: 'differential', valueDivisor: 1024 }
]
],
maxYLabel: []
}
};
@ -843,8 +854,6 @@ $(function() {
/* Initializes the monitor, called only once */
function initGrid() {
var settings;
var series;
/* Apply default values & config */
if (window.localStorage) {
@ -1083,7 +1092,7 @@ $(function() {
};
*/
settings = {
var settings = {
title: chartObj.title,
axes: {
xaxis: {
@ -1097,8 +1106,8 @@ $(function() {
},
yaxis: {
min:0,
max:500,
numberTicks:6
max:100,
tickInterval: 20
}
},
seriesDefaults: {
@ -1124,7 +1133,12 @@ $(function() {
$('table#chartGrid tr:last').append('<td><div class="ui-state-default monitorChart" id="' + 'gridchart' + runtime.chartAI + '"></div></td>');
}
chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, [[,]], settings);
var series = [];
for(i in chartObj.series){
series.push([[,]]);
}
chartObj.chart = $.jqplot('gridchart' + runtime.chartAI, series, settings);
chartObj.numPoints = 0;
if (initialize != true) {
@ -1289,18 +1303,22 @@ $(function() {
// Set y value, if defined
if (value != undefined) {
/*elem.chart.series[j].addPoint(
{ x: chartData.x, y: value },
false,
elem.numPoints >= runtime.gridMaxPoints
);*/
elem.chart.series[j].data.push([chartData.x, value]);
if(elem.maxYLabel.length == 0) {
elem.maxYLabel.push([runtime.xmax, 100]);
}else if(value > elem.maxYLabel[elem.maxYLabel.length - 1][1]) {
elem.maxYLabel.push([chartData.x, value + 200]);
} else if(elem.maxYLabel[elem.maxYLabel.length - 1][0] < runtime.xmin) {
elem.maxYLabel.pop();
}
}
}
// update chart options
elem.chart['axes']['xaxis']['max'] = runtime.xmax;
elem.chart['axes']['xaxis']['min'] = runtime.xmin;
elem.chart['axes']['yaxis']['max'] = (elem.maxYLabel.length == 0) ? 100 : elem.maxYLabel[elem.maxYLabel.length - 1][1];
elem.chart['axes']['yaxis']['tickInterval'] = (elem.maxYLabel.length == 0) ? 20 : Math.floor(elem.maxYLabel[elem.maxYLabel.length - 1][1]/5);
i++;
runtime.charts[orderKey].numPoints++;
if (runtime.redrawCharts) {

2
libraries/Error.class.php
View File

@ -159,7 +159,7 @@ class PMA_Error extends PMA_Message
{
try {
$backtrace = serialize($this->getBacktrace());
} catch(Exception $e){
} catch(Exception $e) {
$backtrace = '';
}
if ($this->hash === null) {

2
libraries/schema/Eps_Relation_Schema.class.php
View File

@ -304,7 +304,7 @@ class PMA_EPS
$modifier = 1;
$font = strtolower($font);
switch($font){
switch ($font) {
/*
* no modifier for arial and sans-serif
*/

2
libraries/schema/Svg_Relation_Schema.class.php
View File

@ -300,7 +300,7 @@ class PMA_SVG extends XMLWriter
$modifier = 1;
$font = strtolower($font);
switch($font){
switch ($font) {
/*
* no modifier for arial and sans-serif
*/

1683
po/af.po
View File

File diff suppressed because it is too large Load Diff

1792
po/ar.po
View File

File diff suppressed because it is too large Load Diff

1683
po/az.po
View File

File diff suppressed because it is too large Load Diff

1704
po/be.po
View File

File diff suppressed because it is too large Load Diff

1712
po/be@latin.po
View File

File diff suppressed because it is too large Load Diff

1696
po/bg.po
View File

File diff suppressed because it is too large Load Diff

1703
po/bn.po
View File

File diff suppressed because it is too large Load Diff

1710
po/br.po
View File

File diff suppressed because it is too large Load Diff

1687
po/bs.po
View File

File diff suppressed because it is too large Load Diff

1716
po/ca.po
View File

File diff suppressed because it is too large Load Diff

1714
po/ckb.po
View File

File diff suppressed because it is too large Load Diff

1717
po/cs.po
View File

File diff suppressed because it is too large Load Diff

1708
po/cy.po
View File

File diff suppressed because it is too large Load Diff

1724
po/da.po
View File

File diff suppressed because it is too large Load Diff

1720
po/de.po
View File

File diff suppressed because it is too large Load Diff

1752
po/el.po
View File

File diff suppressed because it is too large Load Diff

2022
po/en_GB.po
View File

File diff suppressed because it is too large Load Diff

1804
po/es.po
View File

File diff suppressed because it is too large Load Diff

1734
po/et.po
View File

File diff suppressed because it is too large Load Diff

1696
po/eu.po
View File

File diff suppressed because it is too large Load Diff

1708
po/fa.po
View File

File diff suppressed because it is too large Load Diff

1716
po/fi.po
View File

File diff suppressed because it is too large Load Diff

1752
po/fr.po
View File

File diff suppressed because it is too large Load Diff

1726
po/gl.po
View File

File diff suppressed because it is too large Load Diff

1692
po/he.po
View File

File diff suppressed because it is too large Load Diff

1696
po/hi.po
View File

File diff suppressed because it is too large Load Diff

1704
po/hr.po
View File

File diff suppressed because it is too large Load Diff

1720
po/hu.po
View File

File diff suppressed because it is too large Load Diff

1701
po/hy.po
View File

File diff suppressed because it is too large Load Diff

1704
po/id.po
View File

File diff suppressed because it is too large Load Diff

1722
po/it.po
View File

File diff suppressed because it is too large Load Diff

1725
po/ja.po
View File

File diff suppressed because it is too large Load Diff

1703
po/ka.po
View File

File diff suppressed because it is too large Load Diff

1710
po/kk.po
View File

File diff suppressed because it is too large Load Diff

1701
po/ko.po
View File

File diff suppressed because it is too large Load Diff

1704
po/lt.po
View File

File diff suppressed because it is too large Load Diff

1687
po/lv.po
View File

File diff suppressed because it is too large Load Diff

1683
po/mk.po
View File

File diff suppressed because it is too large Load Diff

1701
po/ml.po
View File

File diff suppressed because it is too large Load Diff

1695
po/mn.po
View File

File diff suppressed because it is too large Load Diff

1683
po/ms.po
View File

File diff suppressed because it is too large Load Diff

1704
po/nb.po
View File

File diff suppressed because it is too large Load Diff

1728
po/nl.po
View File

File diff suppressed because it is too large Load Diff

1705
po/pa.po
View File

File diff suppressed because it is too large Load Diff

1692
po/phpmyadmin.pot
View File

File diff suppressed because it is too large Load Diff

1724
po/pl.po
View File

File diff suppressed because it is too large Load Diff

1708
po/pt.po
View File

File diff suppressed because it is too large Load Diff

2148
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

1700
po/ro.po
View File

File diff suppressed because it is too large Load Diff

1720
po/ru.po
View File

File diff suppressed because it is too large Load Diff

1710
po/si.po
View File

File diff suppressed because it is too large Load Diff

1708
po/sk.po
View File

File diff suppressed because it is too large Load Diff

1696
po/sl.po
View File

File diff suppressed because it is too large Load Diff

1687
po/sq.po
View File

File diff suppressed because it is too large Load Diff

1696
po/sr.po
View File

File diff suppressed because it is too large Load Diff

4105
po/sr@latin.po
View File

File diff suppressed because it is too large Load Diff

1734
po/sv.po
View File

File diff suppressed because it is too large Load Diff

1701
po/ta.po
View File

File diff suppressed because it is too large Load Diff

1701
po/te.po
View File

File diff suppressed because it is too large Load Diff

1700
po/th.po
View File

File diff suppressed because it is too large Load Diff

1701
po/tk.po
View File

File diff suppressed because it is too large Load Diff

1739
po/tr.po
View File

File diff suppressed because it is too large Load Diff

1687
po/tt.po
View File

File diff suppressed because it is too large Load Diff

1708
po/ug.po
View File

File diff suppressed because it is too large Load Diff

1712
po/uk.po
View File

File diff suppressed because it is too large Load Diff

1708
po/ur.po
View File

File diff suppressed because it is too large Load Diff

1716
po/uz.po
View File

File diff suppressed because it is too large Load Diff

1724
po/uz@latin.po
View File

File diff suppressed because it is too large Load Diff

1700
po/zh_CN.po
View File

File diff suppressed because it is too large Load Diff

1692
po/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

3
tbl_gis_visualization.php
View File

@ -116,7 +116,8 @@ $visualization = PMA_GIS_visualizationResults(
<input type="hidden" id="pmaThemeImage" value="<?php echo($GLOBALS['pmaThemeImage']); ?>" />
<script language="javascript" type="text/javascript">
function drawOpenLayers() {
function drawOpenLayers()
{
<?php echo (PMA_GIS_visualizationResults($data, $visualizationSettings, 'ol')); ?>
}
</script>

2
test/Environment_test.php
View File

@ -35,7 +35,7 @@ class Environment_test extends PHPUnit_Framework_TestCase
//$pdo->commit();
$this->assertEquals(0, $pdo->errorCode(), 'Error trying to show tables for database');
}
catch (Exception $e){
catch (Exception $e) {
$this->fail("Error: ".$e->getMessage());
}

87
test/classes/PMA_DBQbe_test.php
View File

@ -98,14 +98,19 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for getCommonFunctions
*/
public function testGetCommonFunctions(){
$this->assertTrue($this->object->getCommonFunctions() instanceof PMA_CommonFunctions);
public function testGetCommonFunctions()
{
$this->assertInstanceOf(
'PMA_CommonFunctions',
$this->object->getCommonFunctions()
);
}
/**
* Test for _getSortSelectCell
*/
public function testGetSortSelectCell(){
public function testGetSortSelectCell()
{
$this->assertEquals(
'<td class="center"><select style="width: 12ex" name="criteriaSort[1]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td>',
$this->_callProtectedFunction(
@ -118,7 +123,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getSortRow
*/
public function testGetSortRow(){
public function testGetSortRow()
{
$this->assertEquals(
'<tr class="even noclick"><th>Sort:</th><td class="center"><select style="width: 12ex" name="criteriaSort[0]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td><td class="center"><select style="width: 12ex" name="criteriaSort[1]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td><td class="center"><select style="width: 12ex" name="criteriaSort[2]" size="1"><option value="">&nbsp;</option><option value="ASC">Ascending</option><option value="DESC">Descending</option></select></td></tr>',
$this->_callProtectedFunction(
@ -131,7 +137,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getShowRow
*/
public function testGetShowRow(){
public function testGetShowRow()
{
$this->assertEquals(
'<tr class="odd noclick"><th>Show:</th><td class="center"><input type="checkbox" name="criteriaShow[0]" /></td><td class="center"><input type="checkbox" name="criteriaShow[1]" /></td><td class="center"><input type="checkbox" name="criteriaShow[2]" /></td></tr>',
$this->_callProtectedFunction(
@ -144,7 +151,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getCriteriaInputboxRow
*/
public function testGetCriteriaInputboxRow(){
public function testGetCriteriaInputboxRow()
{
$this->assertEquals(
'<tr class="even noclick"><th>Criteria:</th><td class="center"><input type="hidden" name="prev_criteria[0]" value="" /><input type="text" name="criteria[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="hidden" name="prev_criteria[1]" value="" /><input type="text" name="criteria[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="hidden" name="prev_criteria[2]" value="" /><input type="text" name="criteria[2]" value="" class="textfield" style="width: 12ex" size="20" /></td></tr>',
$this->_callProtectedFunction(
@ -157,7 +165,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getFootersOptions
*/
public function testGetFootersOptions(){
public function testGetFootersOptions()
{
$this->assertEquals(
'<div class="floatleft">Add/Delete criteria rows:<select size="1" name="criteriaRowAdd"><option value="-3">-3</option><option value="-2">-2</option><option value="-1">-1</option><option value="0" selected="selected">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></div>',
$this->_callProtectedFunction(
@ -170,7 +179,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getTableFooters
*/
public function testGetTableFooters(){
public function testGetTableFooters()
{
$this->assertEquals(
'<fieldset class="tblFooters"><div class="floatleft">Add/Delete criteria rows:<select size="1" name="criteriaRowAdd"><option value="-3">-3</option><option value="-2">-2</option><option value="-1">-1</option><option value="0" selected="selected">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></div><div class="floatleft">Add/Delete columns:<select size="1" name="criteriaColumnAdd"><option value="-3">-3</option><option value="-2">-2</option><option value="-1">-1</option><option value="0" selected="selected">0</option><option value="1">1</option><option value="2">2</option><option value="3">3</option></select></div><div class="floatleft"><input type="submit" name="modify"value="Update Query" /></div></fieldset>',
$this->_callProtectedFunction(
@ -183,7 +193,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getAndOrColCell
*/
public function testGetAndOrColCell(){
public function testGetAndOrColCell()
{
$this->assertEquals(
'<td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="and" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[1]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[1]" /></td>',
$this->_callProtectedFunction(
@ -196,7 +207,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getModifyColumnsRow
*/
public function testGetModifyColumnsRow(){
public function testGetModifyColumnsRow()
{
$this->assertEquals(
'<tr class="even noclick"><th>Modify:</th><td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[0]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[0]" value="and" checked="checked" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[0]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[0]" /></td><td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[1]" value="and" checked="checked" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[1]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[1]" /></td><td class="center"><strong>Or:</strong><input type="radio" name="criteriaAndOrColumn[2]" value="or" />&nbsp;&nbsp;<strong>And:</strong><input type="radio" name="criteriaAndOrColumn[2]" value="and" checked="checked" /><br />Ins<input type="checkbox" name="criteriaColumnInsert[2]" />&nbsp;&nbsp;Del<input type="checkbox" name="criteriaColumnDelete[2]" /></td></tr>',
$this->_callProtectedFunction(
@ -209,13 +221,14 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getInsDelAndOrCell
*/
public function testGetInsDelAndOrCell(){
public function testGetInsDelAndOrCell()
{
$GLOBALS['cell_align_right'] = 'cellAlign';
$this->assertEquals(
'<td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[3]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="and"c /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[3]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="or"c /></td></tr></table></td>',
'<td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[3]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[3]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[3]" value="or" checked="checked" /></td></tr></table></td>',
$this->_callProtectedFunction(
'_getInsDelAndOrCell',
array(3, 'checked')
array(3, array('and' => '', 'or' => ' checked="checked"'))
)
);
}
@ -223,7 +236,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getInputboxRow
*/
public function testGetInputboxRow(){
public function testGetInputboxRow()
{
$this->assertEquals(
'<td class="center"><input type="text" name="Or2[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or2[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or2[2]" value="" class="textfield" style="width: 12ex" size="20" /></td>',
$this->_callProtectedFunction(
@ -236,7 +250,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getInsDelAndOrCriteriaRows
*/
public function testGetInsDelAndOrCriteriaRows(){
public function testGetInsDelAndOrCriteriaRows()
{
$this->assertEquals(
'<tr class="odd noclick"><td class="cellAlign nowrap"><!-- Row controls --><table class="nospacing nopadding"><tr><td class="cellAlign nowrap"><small>Ins:</small><input type="checkbox" name="criteriaRowInsert[0]" /></td><td class="cellAlign"><strong>And:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="and" /></td></tr><tr><td class="cellAlign nowrap"><small>Del:</small><input type="checkbox" name="criteriaRowDelete[0]" /></td><td class="cellAlign"><strong>Or:</strong></td><td><input type="radio" name="criteriaAndOrRow[0]" value="or" checked="checked" /></td></tr></table></td><td class="center"><input type="text" name="Or0[0]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[1]" value="" class="textfield" style="width: 12ex" size="20" /></td><td class="center"><input type="text" name="Or0[2]" value="" class="textfield" style="width: 12ex" size="20" /></td></tr>',
$this->_callProtectedFunction(
@ -249,7 +264,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getSelectClause
*/
public function testGetSelectClause(){
public function testGetSelectClause()
{
$this->assertEquals(
'',
$this->_callProtectedFunction(
@ -262,7 +278,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getWhereClause
*/
public function testGetWhereClause(){
public function testGetWhereClause()
{
$this->assertEquals(
'',
$this->_callProtectedFunction(
@ -275,7 +292,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getOrderByClause
*/
public function testGetOrderByClause(){
public function testGetOrderByClause()
{
$this->assertEquals(
'',
$this->_callProtectedFunction(
@ -288,7 +306,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getIndexes
*/
public function testGetIndexes(){
public function testGetIndexes()
{
if (! function_exists('PMA_DBI_get_table_indexes')) {
function PMA_DBI_get_table_indexes()
{
@ -314,7 +333,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getLeftJoinColumnCandidates
*/
public function test_getLeftJoinColumnCandidates(){
public function test_getLeftJoinColumnCandidates()
{
if (! function_exists('PMA_DBI_select_db')) {
function PMA_DBI_select_db()
{
@ -339,7 +359,8 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getMasterTable
*/
public function test_getMasterTable(){
public function test_getMasterTable()
{
$this->assertEquals(
0,
$this->_callProtectedFunction(
@ -357,8 +378,14 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getWhereClauseTablesAndColumns
*/
public function test_getWhereClauseTablesAndColumns(){
$_POST['criteriaColumn'] = array('table1.id', 'table1.value', 'table1.name', 'table1.deleted');
public function test_getWhereClauseTablesAndColumns()
{
$_POST['criteriaColumn'] = array(
'table1.id',
'table1.value',
'table1.name',
'table1.deleted'
);
$this->assertEquals(
array(
'where_clause_tables' => array(),
@ -374,12 +401,13 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getFromClause
*/
public function testGetFromClause(){
public function testGetFromClause()
{
$this->assertEquals(
'`table1`',
'table1',
$this->_callProtectedFunction(
'_getFromClause',
array('relation')
array(array('relwork' => False))
)
);
}
@ -387,13 +415,14 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase
/**
* Test for _getSQLQuery
*/
public function test_getSQLQuery(){
public function test_getSQLQuery()
{
$this->assertEquals(
'FROM `table1`
'FROM table1
',
$this->_callProtectedFunction(
'_getSQLQuery',
array('relation')
array(array('relwork' => False))
)
);
}

40
test/classes/PMA_DbSearch_test.php
View File

@ -16,6 +16,11 @@ require_once 'libraries/url_generating.lib.php';
require_once 'libraries/core.lib.php';
require_once 'libraries/Theme.class.php';
/**
* Tests for database search.
*
* @package PhpMyAdmin-test
*/
class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
{
/**
@ -41,7 +46,10 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
);
}
}
$this->object = $this->getMockForAbstractClass('PMA_DbSearch', array('pma'));
$this->object = $this->getMockForAbstractClass(
'PMA_DbSearch',
array('pma')
);
}
/**
@ -75,14 +83,19 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
/**
* Test for getCommonFunctions
*/
public function testGetCommonFunctions(){
$this->assertTrue($this->object->getCommonFunctions() instanceof PMA_CommonFunctions);
public function testGetCommonFunctions()
{
$this->assertInstanceOf(
'PMA_CommonFunctions',
$this->object->getCommonFunctions()
);
}
/**
* Test for _getSearchSqls
*/
public function testGetSearchSqls(){
public function testGetSearchSqls()
{
$GLOBALS['db'] = 'pma';
if (! function_exists('PMA_DBI_get_columns')) {
@ -111,7 +124,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
/**
* Test for getSearchResults
*/
public function testGetSearchResults(){
public function testGetSearchResults()
{
$this->assertEquals(
'<br /><table class="data"><caption class="tblHeaders">Search results for "<i></i>" :</caption></table>',
$this->object->getSearchResults()
@ -120,14 +134,17 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
/**
* Test for _getResultsRow
*
* @param string $each_table Tables on which search is to be performed
* @param array $newsearchsqls Contains SQL queries
* @param bool $odd_row For displaying contrasting table rows
* @param $output
* @param string $output Expected HTML output
*
* @dataProvider providerForTestGetResultsRow
*/
public function testGetResultsRow($each_table, $newsearchsqls, $odd_row, $output){
public function testGetResultsRow(
$each_table, $newsearchsqls, $odd_row, $output
) {
if (! function_exists('PMA_DBI_fetch_value')) {
function PMA_DBI_fetch_value()
@ -148,7 +165,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
/**
* @return array provider for testGetResultsRow
*/
public function providerForTestGetResultsRow(){
public function providerForTestGetResultsRow()
{
return array(
array(
'table1',
@ -168,7 +186,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
/**
* Test for getSelectionForm
*/
public function testGetSelectionForm(){
public function testGetSelectionForm()
{
$_SESSION[' PMA_token '] = 'token';
$_SESSION['PMA_Theme'] = new PMA_Theme();
$GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
@ -190,7 +209,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase
/**
* Test for _getResultDivs
*/
public function testGetResultDivs(){
public function testGetResultDivs()
{
$this->assertEquals(
'<!-- These two table-image and table-link elements display the table name in browse search results --><div id="table-info"><a class="item" id="table-link" ></a></div><div id="browse-results"><!-- this browse-results div is used to load the browse and delete results in the db search --></div><br class="clearfloat" /><div id="sqlqueryform"><!-- this sqlqueryform div is used to load the delete form in the db search --></div><!-- toggle query box link--><a id="togglequerybox"></a>',
$this->_callProtectedFunction(

3
test/classes/PMA_Error_Handler_test.php
View File

@ -96,7 +96,8 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase
/**
* Test for logError
*/
// public function testLogError(){
// public function testLogError()
// {
//
// $error = new PMA_Error('2', 'Compile Error', 'error.txt', 15);
//

12
test/classes/PMA_Footer_test.php
View File

@ -81,7 +81,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase
*
* @group medium
*/
public function testGetDebugMessage(){
public function testGetDebugMessage()
{
$_SESSION['debug']['queries'] = array('SELECT * FROM `pma_bookmark` WHERE 1', 'SELECT * FROM `db` WHERE 1');
@ -106,7 +107,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase
/**
* Test for _getSelfLink
*/
public function testGetSelfLink(){
public function testGetSelfLink()
{
$GLOBALS['cfg']['NavigationBarIconic'] = false;
$GLOBALS['cfg']['ServerDefault'] = 1;
@ -123,7 +125,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase
/**
* Test for _getSelfLink
*/
public function testGetSelfLinkWithImage(){
public function testGetSelfLinkWithImage()
{
$GLOBALS['cfg']['NavigationBarIconic'] = true;
$GLOBALS['cfg']['ServerDefault'] = 1;
@ -142,7 +145,8 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase
// /**
// * Test for disable
// */
// public function testDisable(){
// public function testDisable()
// {
//
// $GLOBALS['lang'] = 'en';
// $GLOBALS['collation_connection'] = 'utf8_general_ci';

12
test/classes/PMA_Scripts_test.php
View File

@ -69,7 +69,8 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerForTestIncludeFile
*/
public function testIncludeFile($url, $timestamp, $ie_conditional, $output){
public function testIncludeFile($url, $timestamp, $ie_conditional, $output)
{
$this->assertEquals(
$output,
$this->_callPrivateFunction(
@ -82,7 +83,8 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase
/**
* @return array data for testIncludeFile
*/
public function providerForTestIncludeFile(){
public function providerForTestIncludeFile()
{
return array(
array(
'common.js',
@ -106,7 +108,8 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase
/**
* Test for getDisplay
*/
public function testGetDisplay(){
public function testGetDisplay()
{
$this->object->addFile('common.js');
$this->object->addEvent('onClick', 'doSomething');
@ -125,7 +128,8 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase
/**
* test for addCode
*/
public function testAddCode(){
public function testAddCode()
{
$this->object->addCode('alert(\'CodeAdded\')');

42
test/classes/PMA_StorageEngine_test.php
View File

@ -59,7 +59,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getStorageEngines
*/
public function testGetStorageEngines(){
public function testGetStorageEngines()
{
$this->assertEquals(
array(
@ -75,7 +76,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
*
* @group medium
*/
public function testGetHtmlSelect(){
public function testGetHtmlSelect()
{
$this->assertEquals(
'<select name="engine">
@ -94,7 +96,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getEngine
*/
public function testGetEngine(){
public function testGetEngine()
{
$this->assertTrue(
$this->object->getEngine('dummy') instanceof PMA_StorageEngine
@ -104,7 +107,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for isValid
*/
public function testIsValid(){
public function testIsValid()
{
$this->assertTrue(
$this->object->isValid('PBMS')
@ -117,7 +121,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getPage
*/
public function testGetPage(){
public function testGetPage()
{
$this->assertFalse(
$this->object->getPage(1)
@ -127,7 +132,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getInfoPages
*/
public function testGetInfoPages(){
public function testGetInfoPages()
{
$this->assertEquals(
array(),
@ -138,7 +144,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getVariablesLikePattern
*/
public function testGetVariablesLikePattern(){
public function testGetVariablesLikePattern()
{
$this->assertFalse(
$this->object->getVariablesLikePattern()
@ -148,7 +155,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getMysqlHelpPage
*/
public function testGetMysqlHelpPage(){
public function testGetMysqlHelpPage()
{
$this->assertEquals(
'dummy-storage-engine',
@ -159,7 +167,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getVariables
*/
public function testGetVariables(){
public function testGetVariables()
{
$this->assertEquals(
array(),
@ -170,7 +179,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getSupportInformationMessage
*/
public function testGetSupportInformationMessage(){
public function testGetSupportInformationMessage()
{
$this->assertEquals(
'This MySQL server does not support the t storage engine.',
$this->object->getSupportInformationMessage()
@ -198,7 +208,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getComment
*/
public function testGetComment(){
public function testGetComment()
{
$this->assertEquals(
't',
@ -209,7 +220,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for getTitle
*/
public function testGetTitle(){
public function testGetTitle()
{
$this->assertEquals(
't',
@ -220,7 +232,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for engine_init
*/
public function testEngine_init(){
public function testEngine_init()
{
$this->assertNull(
$this->object->engine_init()
@ -230,7 +243,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase
/**
* Test for resolveTypeSize
*/
public function testResolveTypeSize(){
public function testResolveTypeSize()
{
$this->assertEquals(
array(

25
test/classes/PMA_Theme_Manager_test.php
View File

@ -48,13 +48,17 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
public function testHtmlSelectBox()
{
$tm = new PMA_Theme_Manager();
$this->assertContains('<option value="pmahomme" selected="selected">', $tm->getHtmlSelectBox());
$this->assertContains(
'<option value="pmahomme" selected="selected">',
$tm->getHtmlSelectBox()
);
}
/**
* Test for setThemeCookie
*/
public function testSetThemeCookie(){
public function testSetThemeCookie()
{
$tm = new PMA_Theme_Manager();
$this->assertTrue(
$tm->setThemeCookie()
@ -64,7 +68,8 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
/**
* Test for checkConfig
*/
public function testCheckConfig(){
public function testCheckConfig()
{
$tm = new PMA_Theme_Manager();
$this->assertNull(
$tm->checkConfig()
@ -74,7 +79,8 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
/**
* Test for makeBc
*/
public function testMakeBc(){
public function testMakeBc()
{
$tm = new PMA_Theme_Manager();
$this->assertNull(
$tm->makeBc()
@ -88,7 +94,8 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
/**
* Test for getPrintPreviews
*/
public function testGetPrintPreviews(){
public function testGetPrintPreviews()
{
$tm = new PMA_Theme_Manager();
$this->assertEquals(
'<div class="theme_preview"><h2>Original (2.9) </h2><p><a target="_top" class="take_theme" name="original" href="index.php?set_theme=original&amp;server=99&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token"><img src="./themes/original/screen.png" border="1" alt="Original" title="Original" /><br />[ <strong>take it</strong> ]</a></p></div><div class="theme_preview"><h2>pmahomme (1.1) </h2><p><a target="_top" class="take_theme" name="pmahomme" href="index.php?set_theme=pmahomme&amp;server=99&amp;lang=en&amp;collation_connection=utf8_general_ci&amp;token=token"><img src="./themes/pmahomme/screen.png" border="1" alt="pmahomme" title="pmahomme" /><br />[ <strong>take it</strong> ]</a></p></div>',
@ -99,9 +106,13 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
/**
* Test for getFallBackTheme
*/
public function testGetFallBackTheme(){
public function testGetFallBackTheme()
{
$tm = new PMA_Theme_Manager();
$this->assertTrue($tm->getFallBackTheme() instanceof PMA_Theme);
$this->assertInstanceOf(
'PMA_theme',
$tm->getFallBackTheme()
);
}
}

24
test/classes/PMA_Theme_test.php
View File

@ -234,7 +234,8 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
/**
* Test for getCssIEClearFilter
*/
public function testGetCssIEClearFilter(){
public function testGetCssIEClearFilter()
{
$this->assertEquals(
$this->object->getCssIEClearFilter(),
''
@ -244,7 +245,8 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
/**
* Test for getFontSize
*/
public function testGetFontSize(){
public function testGetFontSize()
{
$this->assertEquals(
$this->object->getFontSize(),
'82%'
@ -267,7 +269,8 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
/**
* Test for getCssGradient
*/
public function testgetCssGradient(){
public function testgetCssGradient()
{
$this->assertEquals(
$this->object->getCssGradient('12345', '54321'),
'background-image: url(./themes/svg_gradient.php?from=12345&to=54321);
@ -283,7 +286,8 @@ background: -o-linear-gradient(top, #12345, #54321);'
/**
* Test for getCssCodeMirror
*/
public function testGetCssCodeMirror(){
public function testGetCssCodeMirror()
{
$this->assertEquals(
$this->object->getCssCodeMirror(),
'span.cm-keyword, span.cm-statement-verb {
@ -335,7 +339,8 @@ span.cm-number {
*
* @dataProvider providerForGetImgPath
*/
public function testGetImgPath($file, $output){
public function testGetImgPath($file, $output)
{
$this->assertEquals(
$this->object->getImgPath($file),
$output
@ -346,7 +351,8 @@ span.cm-number {
* Provider for testGetImgPath
* @return array
*/
public function providerForGetImgPath(){
public function providerForGetImgPath()
{
return array(
array(
null,
@ -367,7 +373,8 @@ span.cm-number {
/**
* Test for buildSQPCssRule
*/
public function testBuildSQPCssRule(){
public function testBuildSQPCssRule()
{
$this->assertEquals(
$this->object->buildSQPCssRule('PMA_Config', 'fontSize', '12px'),
'.PMA_Config {fontSize: 12px;}
@ -378,7 +385,8 @@ span.cm-number {
/**
* Test for buildSQPCssData
*/
public function testBuildSQPCssData(){
public function testBuildSQPCssData()
{
$this->assertEquals(
$this->object->buildSQPCssData(),
'.syntax_comment {color: #808000;}

24
test/classes/PMA_Types_Drizzle_test.php
View File

@ -36,7 +36,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerForTestGetTypeDescription
*/
public function testGetTypeDescription($type, $output){
public function testGetTypeDescription($type, $output)
{
$this->assertEquals(
$output,
$this->object->getTypeDescription($type)
@ -47,7 +48,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
* Provider for testGetTypeDescription
* @return array
*/
public function providerForTestGetTypeDescription(){
public function providerForTestGetTypeDescription()
{
return array(
array(
'INTEGER',
@ -128,14 +130,16 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerFortTestGetTypeClass
*/
public function testGetTypeClass($type, $output){
public function testGetTypeClass($type, $output)
{
$this->assertEquals(
$output,
$this->object->getTypeClass($type)
);
}
public function providerFortTestGetTypeClass(){
public function providerFortTestGetTypeClass()
{
return array(
array(
'SERIAL',
@ -168,7 +172,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerFortTestGetFunctionsClass
*/
public function testGetFunctionsClass($class, $output){
public function testGetFunctionsClass($class, $output)
{
if (! function_exists('PMA_DBI_fetch_result')) {
function PMA_DBI_fetch_result($query)
@ -187,7 +192,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
* Provider for testGetFunctionsClass
* @return array
*/
public function providerFortTestGetFunctionsClass(){
public function providerFortTestGetFunctionsClass()
{
return array(
array(
'UUID',
@ -306,7 +312,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
/**
* Test for getAttributes
*/
public function testGetAttributes(){
public function testGetAttributes()
{
$this->assertEquals(
array(
'',
@ -319,7 +326,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase
/**
* Test for getColumns
*/
public function testGetColumns(){
public function testGetColumns()
{
if (! defined('PMA_MYSQL_INT_VERSION')) {
define('PMA_MYSQL_INT_VERSION', 20120130);

24
test/classes/PMA_Types_MySQL_test.php
View File

@ -36,7 +36,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerForTestGetTypeDescription
*/
public function testGetTypeDescription($type, $output){
public function testGetTypeDescription($type, $output)
{
$this->assertEquals(
$output,
$this->object->getTypeDescription($type)
@ -47,7 +48,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
* Provider for testGetTypeDescription
* @return array
*/
public function providerForTestGetTypeDescription(){
public function providerForTestGetTypeDescription()
{
return array(
array(
'TINYINT',
@ -220,14 +222,16 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerFortTestGetTypeClass
*/
public function testGetTypeClass($type, $output){
public function testGetTypeClass($type, $output)
{
$this->assertEquals(
$output,
$this->object->getTypeClass($type)
);
}
public function providerFortTestGetTypeClass(){
public function providerFortTestGetTypeClass()
{
return array(
array(
'SERIAL',
@ -260,7 +264,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
*
* @dataProvider providerFortTestGetFunctionsClass
*/
public function testGetFunctionsClass($class, $output){
public function testGetFunctionsClass($class, $output)
{
if (! defined('PMA_MYSQL_INT_VERSION')) {
define('PMA_MYSQL_INT_VERSION', 60000);
@ -272,7 +277,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
);
}
public function providerFortTestGetFunctionsClass(){
public function providerFortTestGetFunctionsClass()
{
return array(
array(
'CHAR',
@ -419,7 +425,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
/**
* Test for getAttributes
*/
public function testGetAttributes(){
public function testGetAttributes()
{
$this->assertEquals(
array(
'',
@ -435,7 +442,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase
/**
* Test for getColumns
*/
public function testGetColumns(){
public function testGetColumns()
{
$this->assertEquals(
array(
0 => 'INT',

45
test/classes/PMA_Types_test.php
View File

@ -44,7 +44,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getUnaryOperators
*/
public function testGetUnaryOperators(){
public function testGetUnaryOperators()
{
$this->assertEquals(
array(
'IS NULL',
@ -59,7 +60,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getNullOperators
*/
public function testGetNullOperators(){
public function testGetNullOperators()
{
$this->assertEquals(
array(
'IS NULL',
@ -72,7 +74,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getEnumOperators
*/
public function testGetEnumOperators(){
public function testGetEnumOperators()
{
$this->assertEquals(
array(
'=',
@ -85,7 +88,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getTextOperators
*/
public function testgetTextOperators(){
public function testgetTextOperators()
{
$this->assertEquals(
array(
'LIKE',
@ -110,7 +114,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getNumberOperators
*/
public function testGetNumberOperators(){
public function testGetNumberOperators()
{
$this->assertEquals(
array(
'=',
@ -137,7 +142,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
*
* @dataProvider providerForGetTypeOperators
*/
public function testGetTypeOperators($type, $null, $output){
public function testGetTypeOperators($type, $null, $output)
{
$this->assertEquals(
$output,
$this->object->getTypeOperators($type, $null)
@ -147,7 +153,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* data provider for testGetTypeOperators
*/
public function providerForGetTypeOperators(){
public function providerForGetTypeOperators()
{
return array(
array(
'enum',
@ -198,7 +205,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
*
* @dataProvider providerForTestGetTypeOperatorsHtml
*/
public function testGetTypeOperatorsHtml($type, $null, $selectedOperator, $output){
public function testGetTypeOperatorsHtml($type, $null, $selectedOperator, $output)
{
$this->assertEquals(
$output,
$this->object->getTypeOperatorsHtml($type, $null, $selectedOperator)
@ -208,7 +216,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Provider for testGetTypeOperatorsHtml
*/
public function providerForTestGetTypeOperatorsHtml(){
public function providerForTestGetTypeOperatorsHtml()
{
return array(
array(
'enum',
@ -222,7 +231,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getTypeDescription
*/
public function testGetTypeDescription(){
public function testGetTypeDescription()
{
$this->assertEquals(
'',
$this->object->getTypeDescription('enum')
@ -232,7 +242,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getFunctionsClass
*/
public function testGetFunctionsClass(){
public function testGetFunctionsClass()
{
$this->assertEquals(
array(),
$this->object->getFunctionsClass('enum')
@ -242,7 +253,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getFunctions
*/
public function testGetFunctions(){
public function testGetFunctions()
{
$this->assertEquals(
array(),
$this->object->getFunctions('enum')
@ -252,7 +264,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getAllFunctions
*/
public function testGetAllFunctions(){
public function testGetAllFunctions()
{
$this->assertEquals(
array(),
$this->object->getAllFunctions()
@ -262,7 +275,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getAttributes
*/
public function testGetAttributes(){
public function testGetAttributes()
{
$this->assertEquals(
array(),
$this->object->getAttributes()
@ -272,7 +286,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
/**
* Test for getColumns
*/
public function testGetColumns(){
public function testGetColumns()
{
$this->assertEquals(
array(
'INT',

9
test/classes/gis/PMA_GIS_Geometry_test.php
View File

@ -254,7 +254,8 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
* @param type $output
* @dataProvider providerForTestGetBoundsForOl
*/
public function testGetBoundsForOl($srid, $scale_data, $output){
public function testGetBoundsForOl($srid, $scale_data, $output)
{
$this->assertEquals(
$this->_callProtectedFunction(
@ -291,7 +292,8 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
*
*@dataProvider providerForTestGetPolygonArrayForOpenLayers
*/
public function testGetPolygonArrayForOpenLayers($polygons, $srid, $output){
public function testGetPolygonArrayForOpenLayers($polygons, $srid, $output)
{
$this->assertEquals(
$this->_callProtectedFunction(
@ -302,7 +304,8 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
);
}
public function providerForTestGetPolygonArrayForOpenLayers(){
public function providerForTestGetPolygonArrayForOpenLayers()
{
return array(
array(

2
test/classes/gis/PMA_GIS_Geometrycollection_test.php
View File

@ -236,7 +236,7 @@ class PMA_GIS_Geometrycollection_test extends PHPUnit_Framework_TestCase
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertTrue($return instanceof TCPDF);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf()

3
test/classes/gis/PMA_GIS_Linestring_test.php
View File

@ -181,6 +181,7 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
/* TODO: this never fails */
$this->assertTrue(true);
}
@ -220,7 +221,7 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertTrue($return instanceof TCPDF);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf()

55
test/classes/gis/PMA_GIS_Multilinestring_test.php
View File

@ -235,14 +235,19 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
/* TODO: this never fails */
$this->assertTrue(true);
}
public function providerForPrepareRowAsPng(){
public function providerForPrepareRowAsPng()
{
return array(
array(
@ -272,14 +277,18 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf(){
public function providerForPrepareRowAsPdf()
{
return array(
array(
@ -307,15 +316,18 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
*
*@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);
$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(
@ -344,13 +356,20 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
*
*@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);
$this->assertEquals(
$output,
$this->object->prepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsOl(){
public function providerForPrepareRowAsOl()
{
return array(
array(

55
test/classes/gis/PMA_GIS_Multipoint_test.php
View File

@ -179,14 +179,19 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
/* TODO: this never fails */
$this->assertTrue(true);
}
public function providerForPrepareRowAsPng(){
public function providerForPrepareRowAsPng()
{
return array(
array(
@ -216,14 +221,18 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf(){
public function providerForPrepareRowAsPdf()
{
return array(
array(
@ -251,15 +260,18 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
*
*@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);
$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(
@ -288,13 +300,20 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
*
*@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);
$this->assertEquals(
$output,
$this->object->prepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsOl(){
public function providerForPrepareRowAsOl()
{
return array(
array(

55
test/classes/gis/PMA_GIS_Multipolygon_test.php
View File

@ -273,14 +273,19 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
/* TODO: this never fails */
$this->assertTrue(true);
}
public function providerForPrepareRowAsPng(){
public function providerForPrepareRowAsPng()
{
return array(
array(
@ -310,14 +315,18 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf(){
public function providerForPrepareRowAsPdf()
{
return array(
array(
@ -345,15 +354,18 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
*
*@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);
$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(
@ -382,13 +394,20 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
*
*@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);
$this->assertEquals(
$output,
$this->object->prepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsOl(){
public function providerForPrepareRowAsOl()
{
return array(
array(

58
test/classes/gis/PMA_GIS_Point_test.php
View File

@ -181,14 +181,19 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
/* TODO: this never fails */
$this->assertTrue(true);
}
public function providerForPrepareRowAsPng(){
public function providerForPrepareRowAsPng()
{
return array(
array(
@ -218,14 +223,18 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf(){
public function providerForPrepareRowAsPdf()
{
return array(
array(
@ -253,14 +262,20 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
*
*@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);
$this->assertEquals(
$output,
$this->object->prepareRowAsSvg(
$spatial, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsSvg(){
public function providerForPrepareRowAsSvg()
{
return array(
array(
@ -289,13 +304,20 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
*
*@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);
$this->assertEquals(
$output,
$this->object->prepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsOl(){
public function providerForPrepareRowAsOl()
{
return array(
array(

58
test/classes/gis/PMA_GIS_Polygon_test.php
View File

@ -361,14 +361,19 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPng(
$spatial, $label, $line_color, $scale_data, $image
);
/* TODO: this never fails */
$this->assertTrue(true);
}
public function providerForPrepareRowAsPng(){
public function providerForPrepareRowAsPng()
{
return array(
array(
@ -398,14 +403,18 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
*
*@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);
$return = $this->object->prepareRowAsPdf(
$spatial, $label, $line_color, $scale_data, $pdf
);
$this->assertInstanceOf('TCPDF', $return);
}
public function providerForPrepareRowAsPdf(){
public function providerForPrepareRowAsPdf()
{
return array(
array(
@ -433,15 +442,18 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
*
*@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);
$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(
@ -470,13 +482,20 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
*
*@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);
$this->assertEquals(
$output,
$this->object->prepareRowAsOl(
$spatial, $srid, $label, $line_color, $scale_data
)
);
}
public function providerForPrepareRowAsOl(){
public function providerForPrepareRowAsOl()
{
return array(
array(
@ -508,7 +527,8 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
$this->assertTrue($this->object->isOuterRing($ring));
}
public function providerForIsOuterRing(){
public function providerForIsOuterRing()
{
return array(
array(

9
test/engines/PMA_StorageEngine_bdb_test.php
View File

@ -59,7 +59,8 @@ class PMA_StorageEngine_bdb_test extends PHPUnit_Framework_TestCase
/**
* Test for getVariables
*/
public function testGetVariables(){
public function testGetVariables()
{
$this->assertEquals(
$this->object->getVariables(),
array(
@ -104,7 +105,8 @@ class PMA_StorageEngine_bdb_test extends PHPUnit_Framework_TestCase
/**
* Test for getVariablesLikePattern
*/
public function testGetVariablesLikePattern(){
public function testGetVariablesLikePattern()
{
$this->assertEquals(
$this->object->getVariablesLikePattern(),
'%bdb%'
@ -114,7 +116,8 @@ class PMA_StorageEngine_bdb_test extends PHPUnit_Framework_TestCase
/**
* Test for getMysqlHelpPage
*/
public function testGetMysqlHelpPage(){
public function testGetMysqlHelpPage()
{
$this->assertEquals(
$this->object->getMysqlHelpPage(),
'bdb'

3
test/engines/PMA_StorageEngine_binlog_test.php
View File

@ -59,7 +59,8 @@ class PMA_StorageEngine_binlog_test extends PHPUnit_Framework_TestCase
/**
* Test for getMysqlHelpPage
*/
public function testGetMysqlHelpPage(){
public function testGetMysqlHelpPage()
{
$this->assertEquals(
$this->object->getMysqlHelpPage(),
'binary-log'

30
test/engines/PMA_StorageEngine_innodb_test.php
View File

@ -72,7 +72,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getVariables
*/
public function testGetVariables(){
public function testGetVariables()
{
$this->assertEquals(
$this->object->getVariables(),
array(
@ -174,7 +175,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getVariablesLikePattern
*/
public function testGetVariablesLikePattern(){
public function testGetVariablesLikePattern()
{
$this->assertEquals(
$this->object->getVariablesLikePattern(),
'innodb\\_%'
@ -184,7 +186,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getInfoPages
*/
public function testGetInfoPages(){
public function testGetInfoPages()
{
$this->assertEquals(
$this->object->getInfoPages(),
array()
@ -202,7 +205,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getPageBufferpool
*/
public function testGetPageBufferpool(){
public function testGetPageBufferpool()
{
$this->assertEquals(
$this->object->getPageBufferpool(),
'<table class="data" id="table_innodb_bufferpool_usage">
@ -288,7 +292,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getPageStatus
*/
public function testGetPageStatus(){
public function testGetPageStatus()
{
if (! function_exists('PMA_DBI_fetch_value')) {
function PMA_DBI_fetch_value()
{
@ -308,7 +313,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getPage
*/
public function testGetPage(){
public function testGetPage()
{
$this->assertFalse(
$this->object->getPage('Status')
);
@ -324,7 +330,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getMysqlHelpPage
*/
public function testGetMysqlHelpPage(){
public function testGetMysqlHelpPage()
{
$this->assertEquals(
$this->object->getMysqlHelpPage(),
'innodb'
@ -335,7 +342,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getInnodbPluginVersion
*/
public function testGetInnodbPluginVersion(){
public function testGetInnodbPluginVersion()
{
$this->assertEquals(
$this->object->getInnodbPluginVersion(),
2
@ -346,7 +354,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for supportsFilePerTable
*/
public function testSupportsFilePerTable(){
public function testSupportsFilePerTable()
{
$this->assertEquals(
$this->object->supportsFilePerTable(),
false
@ -357,7 +366,8 @@ class PMA_StorageEngine_innodb_test extends PHPUnit_Framework_TestCase
/**
* Test for getInnodbFileFormat
*/
public function testGetInnodbFileFormat(){
public function testGetInnodbFileFormat()
{
$this->assertEquals(
$this->object->getInnodbFileFormat(),
2

Some files were not shown because too many files have changed in this diff Show More