From 7823dfffa55792179f9a203edee336b853a9ba06 Mon Sep 17 00:00:00 2001 From: Yasitha Pandithawatta Date: Fri, 24 Aug 2012 22:15:19 +0530 Subject: [PATCH] switched assertEquals params in test/classes directory --- test/classes/PMA_DBQbe_test.php | 94 ++++++++++++------------- test/classes/PMA_DbSearch_test.php | 28 ++++---- test/classes/PMA_Error_Handler_test.php | 37 ++++++---- test/classes/PMA_Footer_test.php | 18 ++--- test/classes/PMA_Scripts_test.php | 8 +-- test/classes/PMA_StorageEngine_test.php | 48 ++++++------- test/classes/PMA_Types_Drizzle_test.php | 20 +++--- test/classes/PMA_Types_MySQL_test.php | 16 ++--- test/classes/PMA_Types_test.php | 57 ++++++++------- 9 files changed, 169 insertions(+), 157 deletions(-) diff --git a/test/classes/PMA_DBQbe_test.php b/test/classes/PMA_DBQbe_test.php index 55ffb4a1b7..5139837180 100644 --- a/test/classes/PMA_DBQbe_test.php +++ b/test/classes/PMA_DBQbe_test.php @@ -107,11 +107,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetSortSelectCell(){ $this->assertEquals( + '', $this->_callProtectedFunction( '_getSortSelectCell', array(1) - ), - '' + ) ); } @@ -120,12 +120,12 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetSortRow(){ $this->assertEquals( + 'Sort:', $this->_callProtectedFunction( '_getSortRow', array() - ), - 'Sort:' - ); + ) + ); } /** @@ -133,11 +133,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetShowRow(){ $this->assertEquals( + 'Show:', $this->_callProtectedFunction( '_getShowRow', array() - ), - 'Show:' + ) ); } @@ -146,11 +146,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetCriteriaInputboxRow(){ $this->assertEquals( + 'Criteria:', $this->_callProtectedFunction( '_getCriteriaInputboxRow', array() - ), - 'Criteria:' + ) ); } @@ -159,11 +159,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetFootersOptions(){ $this->assertEquals( + '
Add/Delete criteria rows:
', $this->_callProtectedFunction( '_getFootersOptions', array('row') - ), - '
Add/Delete criteria rows:
' + ) ); } @@ -172,11 +172,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetTableFooters(){ $this->assertEquals( + '
Add/Delete criteria rows:
Add/Delete columns:
', $this->_callProtectedFunction( '_getTableFooters', array() - ), - '
Add/Delete criteria rows:
Add/Delete columns:
' + ) ); } @@ -185,11 +185,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetAndOrColCell(){ $this->assertEquals( + 'Or:  And:
Ins  Del', $this->_callProtectedFunction( '_getAndOrColCell', array(1) - ), - 'Or:  And:
Ins  Del' + ) ); } @@ -198,11 +198,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetModifyColumnsRow(){ $this->assertEquals( + 'Modify:Or:  And:
Ins  DelOr:  And:
Ins  DelOr:  And:
Ins  Del', $this->_callProtectedFunction( '_getModifyColumnsRow', array() - ), - 'Modify:Or:  And:
Ins  DelOr:  And:
Ins  DelOr:  And:
Ins  Del' + ) ); } @@ -212,11 +212,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase public function testGetInsDelAndOrCell(){ $GLOBALS['cell_align_right'] = 'cellAlign'; $this->assertEquals( + '
Ins:And:
Del:Or:
', $this->_callProtectedFunction( '_getInsDelAndOrCell', array(3, 'checked') - ), - '
Ins:And:
Del:Or:
' + ) ); } @@ -225,11 +225,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetInputboxRow(){ $this->assertEquals( + '', $this->_callProtectedFunction( '_getInputboxRow', array(2,3) - ), - '' + ) ); } @@ -238,11 +238,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetInsDelAndOrCriteriaRows(){ $this->assertEquals( + '
Ins:And:
Del:Or:
', $this->_callProtectedFunction( '_getInsDelAndOrCriteriaRows', array(2,3) - ), - '
Ins:And:
Del:Or:
' + ) ); } @@ -251,11 +251,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetSelectClause(){ $this->assertEquals( + '', $this->_callProtectedFunction( '_getSelectClause', array() - ), - '' + ) ); } @@ -264,11 +264,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetWhereClause(){ $this->assertEquals( + '', $this->_callProtectedFunction( '_getWhereClause', array() - ), - '' + ) ); } @@ -277,11 +277,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetOrderByClause(){ $this->assertEquals( + '', $this->_callProtectedFunction( '_getOrderByClause', array() - ), - '' + ) ); } @@ -296,6 +296,10 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase } } $this->assertEquals( + array( + 'unique' => array(), + 'index' => array() + ), $this->_callProtectedFunction( '_getIndexes', array( @@ -303,10 +307,6 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase array('column1', 'column2', 'column3'), array('column2') ) - ), - array( - 'unique' => array(), - 'index' => array() ) ); } @@ -322,6 +322,9 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase } } $this->assertEquals( + array( + 0 => 'column2' + ), $this->_callProtectedFunction( '_getLeftJoinColumnCandidates', array( @@ -329,9 +332,6 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase array('column1', 'column2', 'column3'), array('column2') ) - ), - array( - 0 => 'column2' ) ); } @@ -341,6 +341,7 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function test_getMasterTable(){ $this->assertEquals( + 0, $this->_callProtectedFunction( '_getMasterTable', array( @@ -349,8 +350,7 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase array('column2'), array('pma') ) - ), - 0 + ) ); } @@ -360,13 +360,13 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase public function test_getWhereClauseTablesAndColumns(){ $_POST['criteriaColumn'] = array('table1.id', 'table1.value', 'table1.name', 'table1.deleted'); $this->assertEquals( - $this->_callProtectedFunction( - '_getWhereClauseTablesAndColumns', - array() - ), array( 'where_clause_tables' => array(), 'where_clause_columns' => array() + ), + $this->_callProtectedFunction( + '_getWhereClauseTablesAndColumns', + array() ) ); } @@ -376,11 +376,11 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function testGetFromClause(){ $this->assertEquals( + '`table1`', $this->_callProtectedFunction( '_getFromClause', array('relation') - ), - '`table1`' + ) ); } @@ -389,12 +389,12 @@ class PMA_DBQbe_test extends PHPUnit_Framework_TestCase */ public function test_getSQLQuery(){ $this->assertEquals( + 'FROM `table1` +', $this->_callProtectedFunction( '_getSQLQuery', array('relation') - ), - 'FROM `table1` -' + ) ); } } diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/PMA_DbSearch_test.php index cf88afc0fb..4bcb52bd8e 100644 --- a/test/classes/PMA_DbSearch_test.php +++ b/test/classes/PMA_DbSearch_test.php @@ -96,15 +96,15 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase } $this->assertEquals( + array ( + 'select_columns' => 'SELECT * FROM `pma`.`table1` WHERE FALSE', + 'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE', + 'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE' + ), $this->_callProtectedFunction( '_getSearchSqls', array('table1') - ), - array ( - 'select_columns' => 'SELECT * FROM `pma`.`table1` WHERE FALSE', - 'select_count' => 'SELECT COUNT(*) AS `count` FROM `pma`.`table1` WHERE FALSE', - 'delete' => 'DELETE FROM `pma`.`table1` WHERE FALSE' - ) + ) ); } @@ -113,8 +113,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase */ public function testGetSearchResults(){ $this->assertEquals( - $this->object->getSearchResults(), - '
Search results for "" :
' + '
Search results for "" :
', + $this->object->getSearchResults() ); } @@ -137,11 +137,11 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase } $GLOBALS['cfg']['AjaxEnable'] = true; $this->assertEquals( + $output, $this->_callProtectedFunction( '_getResultsRow', array($each_table, $newsearchsqls, $odd_row) - ), - $output + ) ); } @@ -174,7 +174,6 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase $GLOBALS['pmaThemeImage'] = 'themes/dot.gif'; $url_params = array('param1', 'param2'); $this->assertEquals( - $this->object->getSelectionForm($url_params), '
Search in database
Words or values to search for (wildcard: "%"):
Find:
@@ -183,7 +182,8 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase

-
Inside tables:
Select All  / Unselect All
Inside column:

' +Inside tables:Select All  / Unselect AllInside column:

', + $this->object->getSelectionForm($url_params) ); } @@ -192,11 +192,11 @@ class PMA_DbSearch_test extends PHPUnit_Framework_TestCase */ public function testGetResultDivs(){ $this->assertEquals( + '

', $this->_callProtectedFunction( '_getResultDivs', array() - ), - '

' + ) ); } diff --git a/test/classes/PMA_Error_Handler_test.php b/test/classes/PMA_Error_Handler_test.php index 51f62d615c..3300569213 100644 --- a/test/classes/PMA_Error_Handler_test.php +++ b/test/classes/PMA_Error_Handler_test.php @@ -74,7 +74,7 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Error_Handler']['gather'] = true; - $this->assertEquals($this->object->handleError($errno, $errstr, $errfile, $errline), $output); + $this->assertEquals( $output, $this->object->handleError($errno, $errstr, $errfile, $errline)); } /** @@ -114,8 +114,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase public function testGetDispUserErrors() { - $this->assertEquals($this->object->getDispUserErrors(), - '
Compile Error
' + $this->assertEquals( + '
Compile Error
', + $this->object->getDispUserErrors() ); } @@ -126,8 +127,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase { $GLOBALS['cfg']['Error_Handler']['display'] = false; - $this->assertEquals($this->object->getDispUserErrors(), - '' + $this->assertEquals( + '', + $this->object->getDispUserErrors() ); } @@ -139,8 +141,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Error_Handler']['display'] = true; - $this->assertEquals($this->object->getDispErrors(), - '' + $this->assertEquals( + '', + $this->object->getDispErrors() ); } @@ -173,8 +176,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase ->method('getErrors') ->will($this->returnValue($err)); - $this->assertEquals($this->object->countErrors(), - 0 + $this->assertEquals( + 0, + $this->object->countErrors() ); } @@ -191,8 +195,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase ->method('countErrors', 'getErrors') ->will($this->returnValue(1, $err)); - $this->assertEquals($this->object->countUserErrors(), - 0 + $this->assertEquals( + 0, + $this->object->countUserErrors() ); } @@ -218,8 +223,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase public function testCountDisplayErrorsForDisplayTrue() { $GLOBALS['cfg']['Error_Handler']['display'] = true; - $this->assertEquals($this->object->countDisplayErrors(), - 0 + $this->assertEquals( + 0, + $this->object->countDisplayErrors() ); } @@ -229,8 +235,9 @@ class PMA_Error_Handler_test extends PHPUnit_Framework_TestCase public function testCountDisplayErrorsForDisplayFalse() { $GLOBALS['cfg']['Error_Handler']['display'] = false; - $this->assertEquals($this->object->countDisplayErrors(), - 0 + $this->assertEquals( + 0, + $this->object->countDisplayErrors() ); } diff --git a/test/classes/PMA_Footer_test.php b/test/classes/PMA_Footer_test.php index 67dc59f437..8d92129b84 100644 --- a/test/classes/PMA_Footer_test.php +++ b/test/classes/PMA_Footer_test.php @@ -86,10 +86,6 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase $_SESSION['debug']['queries'] = array('SELECT * FROM `pma_bookmark` WHERE 1', 'SELECT * FROM `db` WHERE 1'); $this->assertEquals( - $this->_callPrivateFunction( - '_getDebugMessage', - array() - ), '
2 queries executed 0 times in 0 seconds
Array
 (
     [queries] => Array
@@ -99,7 +95,11 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase
         )
 
 )
-
' +', + $this->_callPrivateFunction( + '_getDebugMessage', + array() + ) ); } @@ -112,11 +112,11 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['ServerDefault'] = 1; $this->assertEquals( + '', $this->_callPrivateFunction( '_getSelfLink', array('db=mysql&token=1234') - ), - '' + ) ); } @@ -131,11 +131,11 @@ class PMA_Footer_test extends PHPUnit_Framework_TestCase $GLOBALS['pmaThemeImage'] = 'image'; $this->assertEquals( + '', $this->_callPrivateFunction( '_getSelfLink', array('db=mysql&token=1234') - ), - '' + ) ); } diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/PMA_Scripts_test.php index f80ca388e6..b270f1487b 100644 --- a/test/classes/PMA_Scripts_test.php +++ b/test/classes/PMA_Scripts_test.php @@ -71,11 +71,11 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase */ public function testIncludeFile($url, $timestamp, $ie_conditional, $output){ $this->assertEquals( + $output, $this->_callPrivateFunction( '_includeFile', array($url, $timestamp, $ie_conditional) - ), - $output + ) ); } @@ -130,10 +130,10 @@ class PMA_Scripts_test extends PHPUnit_Framework_TestCase $this->object->addCode('alert(\'CodeAdded\')'); $this->assertEquals( - $this->object->getDisplay(), '' +// ]]>', + $this->object->getDisplay() ); } } diff --git a/test/classes/PMA_StorageEngine_test.php b/test/classes/PMA_StorageEngine_test.php index 1305320f26..3ad190ad24 100644 --- a/test/classes/PMA_StorageEngine_test.php +++ b/test/classes/PMA_StorageEngine_test.php @@ -62,11 +62,11 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetStorageEngines(){ $this->assertEquals( - $this->object->getStorageEngines(), array( 'dummy' => 'table1', 'engine' => 'table`2' - ) + ), + $this->object->getStorageEngines() ); } @@ -78,7 +78,6 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetHtmlSelect(){ $this->assertEquals( - $this->object->getHtmlSelect(), ' -' +', + $this->object->getHtmlSelect() ); } @@ -130,8 +130,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetInfoPages(){ $this->assertEquals( - $this->object->getInfoPages(), - array() + array(), + $this->object->getInfoPages() ); } @@ -151,8 +151,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetMysqlHelpPage(){ $this->assertEquals( - $this->object->getMysqlHelpPage(), - 'dummy-storage-engine' + 'dummy-storage-engine', + $this->object->getMysqlHelpPage() ); } @@ -162,8 +162,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetVariables(){ $this->assertEquals( - $this->object->getVariables(), - array() + array(), + $this->object->getVariables() ); } @@ -172,26 +172,26 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase */ public function testGetSupportInformationMessage(){ $this->assertEquals( - $this->object->getSupportInformationMessage(), - 'This MySQL server does not support the t storage engine.' + 'This MySQL server does not support the t storage engine.', + $this->object->getSupportInformationMessage() ); $this->object->support = 1; $this->assertEquals( - $this->object->getSupportInformationMessage(), - 't has been disabled for this MySQL server.' + 't has been disabled for this MySQL server.', + $this->object->getSupportInformationMessage() ); $this->object->support = 2; $this->assertEquals( - $this->object->getSupportInformationMessage(), - 't is available on this MySQL server.' + 't is available on this MySQL server.', + $this->object->getSupportInformationMessage() ); $this->object->support = 3; $this->assertEquals( - $this->object->getSupportInformationMessage(), - 't is the default storage engine on this MySQL server.' + 't is the default storage engine on this MySQL server.', + $this->object->getSupportInformationMessage() ); } @@ -201,8 +201,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetComment(){ $this->assertEquals( - $this->object->getComment(), - 't' + 't', + $this->object->getComment() ); } @@ -212,8 +212,8 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testGetTitle(){ $this->assertEquals( - $this->object->getTitle(), - 't' + 't', + $this->object->getTitle() ); } @@ -233,11 +233,11 @@ class PMA_StorageEngine_test extends PHPUnit_Framework_TestCase public function testResolveTypeSize(){ $this->assertEquals( - $this->object->resolveTypeSize(12), array( 0 => 12, 1 => 'B' - ) + ), + $this->object->resolveTypeSize(12) ); } } diff --git a/test/classes/PMA_Types_Drizzle_test.php b/test/classes/PMA_Types_Drizzle_test.php index a6b93fa519..04f833954e 100644 --- a/test/classes/PMA_Types_Drizzle_test.php +++ b/test/classes/PMA_Types_Drizzle_test.php @@ -38,8 +38,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase */ public function testGetTypeDescription($type, $output){ $this->assertEquals( - $this->object->getTypeDescription($type), - $output + $output, + $this->object->getTypeDescription($type) ); } @@ -130,8 +130,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase */ public function testGetTypeClass($type, $output){ $this->assertEquals( - $this->object->getTypeClass($type), - $output + $output, + $this->object->getTypeClass($type) ); } @@ -178,8 +178,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase } $this->assertEquals( - $this->object->getFunctionsClass($class), - $output + $output, + $this->object->getFunctionsClass($class) ); } @@ -308,11 +308,11 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase */ public function testGetAttributes(){ $this->assertEquals( - $this->object->getAttributes(), array( '', 'on update CURRENT_TIMESTAMP', - ) + ), + $this->object->getAttributes() ); } @@ -326,7 +326,6 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase } $this->assertEquals( - $this->object->getColumns(), array( 0 => 'INT', 1 => 'VARCHAR', @@ -360,7 +359,8 @@ class PMA_Types_Drizzle_test extends PHPUnit_Framework_TestCase '-', 'IPV6' ), - ) + ), + $this->object->getColumns() ); } } diff --git a/test/classes/PMA_Types_MySQL_test.php b/test/classes/PMA_Types_MySQL_test.php index 3a44622d42..8219511647 100644 --- a/test/classes/PMA_Types_MySQL_test.php +++ b/test/classes/PMA_Types_MySQL_test.php @@ -38,8 +38,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase */ public function testGetTypeDescription($type, $output){ $this->assertEquals( - $this->object->getTypeDescription($type), - $output + $output, + $this->object->getTypeDescription($type) ); } @@ -222,8 +222,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase */ public function testGetTypeClass($type, $output){ $this->assertEquals( - $this->object->getTypeClass($type), - $output + $output, + $this->object->getTypeClass($type) ); } @@ -421,14 +421,14 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase */ public function testGetAttributes(){ $this->assertEquals( - $this->object->getAttributes(), array( '', 'BINARY', 'UNSIGNED', 'UNSIGNED ZEROFILL', 'on update CURRENT_TIMESTAMP', - ) + ), + $this->object->getAttributes() ); } @@ -437,7 +437,6 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase */ public function testGetColumns(){ $this->assertEquals( - $this->object->getColumns(), array( 0 => 'INT', 1 => 'VARCHAR', @@ -496,7 +495,8 @@ class PMA_Types_MySQL_test extends PHPUnit_Framework_TestCase 'MULTIPOLYGON', 'GEOMETRYCOLLECTION', ) - ) + ), + $this->object->getColumns() ); } } diff --git a/test/classes/PMA_Types_test.php b/test/classes/PMA_Types_test.php index 35f340b1d1..453fa1c04e 100644 --- a/test/classes/PMA_Types_test.php +++ b/test/classes/PMA_Types_test.php @@ -43,13 +43,14 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase * Test for getUnaryOperators */ public function testGetUnaryOperators(){ - $this->assertEquals($this->object->getUnaryOperators(), + $this->assertEquals( array( 'IS NULL', 'IS NOT NULL', "= ''", "!= ''", - ) + ), + $this->object->getUnaryOperators() ); } @@ -57,11 +58,12 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase * Test for getNullOperators */ public function testGetNullOperators(){ - $this->assertEquals($this->object->getNullOperators(), + $this->assertEquals( array( 'IS NULL', 'IS NOT NULL', - ) + ), + $this->object->getNullOperators() ); } @@ -69,11 +71,12 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase * Test for getEnumOperators */ public function testGetEnumOperators(){ - $this->assertEquals($this->object->getEnumOperators(), + $this->assertEquals( array( '=', '!=', - ) + ), + $this->object->getEnumOperators() ); } @@ -81,7 +84,7 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase * Test for getTextOperators */ public function testgetTextOperators(){ - $this->assertEquals($this->object->getTextOperators(), + $this->assertEquals( array( 'LIKE', 'LIKE %...%', @@ -97,7 +100,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase 'NOT IN (...)', 'BETWEEN', 'NOT BETWEEN', - ) + ), + $this->object->getTextOperators() ); } @@ -105,7 +109,7 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase * Test for getNumberOperators */ public function testGetNumberOperators(){ - $this->assertEquals($this->object->getNumberOperators(), + $this->assertEquals( array( '=', '>', @@ -119,7 +123,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase 'NOT IN (...)', 'BETWEEN', 'NOT BETWEEN', - ) + ), + $this->object->getNumberOperators() ); } @@ -132,8 +137,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetTypeOperators($type, $null, $output){ $this->assertEquals( - $this->object->getTypeOperators($type, $null), - $output + $output, + $this->object->getTypeOperators($type, $null) ); } @@ -193,8 +198,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetTypeOperatorsHtml($type, $null, $selectedOperator, $output){ $this->assertEquals( - $this->object->getTypeOperatorsHtml($type, $null, $selectedOperator), - $output + $output, + $this->object->getTypeOperatorsHtml($type, $null, $selectedOperator) ); } @@ -217,8 +222,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetTypeDescription(){ $this->assertEquals( - $this->object->getTypeDescription('enum'), - '' + '', + $this->object->getTypeDescription('enum') ); } @@ -227,8 +232,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetFunctionsClass(){ $this->assertEquals( - $this->object->getFunctionsClass('enum'), - array() + array(), + $this->object->getFunctionsClass('enum') ); } @@ -237,8 +242,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetFunctions(){ $this->assertEquals( - $this->object->getFunctions('enum'), - array() + array(), + $this->object->getFunctions('enum') ); } @@ -247,8 +252,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetAllFunctions(){ $this->assertEquals( - $this->object->getAllFunctions(), - array() + array(), + $this->object->getAllFunctions() ); } @@ -257,8 +262,8 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetAttributes(){ $this->assertEquals( - $this->object->getAttributes(), - array() + array(), + $this->object->getAttributes() ); } @@ -267,13 +272,13 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase */ public function testGetColumns(){ $this->assertEquals( - $this->object->getColumns(), array( 'INT', 'VARCHAR', 'TEXT', 'DATE', - ) + ), + $this->object->getColumns() ); } }