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

unit tests updated. Some global variables were set in setup functions of some test files. one testing function with mockobjects was changed from once() to exactly(2) because the bug fix has made that function calls twice

Browse Source 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
This commit is contained in:
Sampath Liyanage 2014-01-27 21:53:36 +05:30
parent e8fa9e5335
commit ea0ad9d41c
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/classes/PMA_Header_test.php
View File

@ -55,6 +55,7 @@ class PMA_Header_Test extends PHPUnit_Framework_TestCase
$GLOBALS['PMA_Config']->enableBc();
$GLOBALS['cfg']['Server']['verbose'] = 'verbose host';
$GLOBALS['cfg']['Server']['pmadb'] = '';
$GLOBALS['default_query'] = true;
}
/**

3
test/libraries/PMA_insert_edit_test.php
View File

@ -50,6 +50,9 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
$GLOBALS['text_dir'] = 'ltr';
$GLOBALS['db'] = 'db';
$GLOBALS['table'] = 'table';
$GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
$GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
$GLOBALS['cfg']['Server']['user'] = 'user';
}
/**

9
test/libraries/PMA_server_binlog_test.php
View File

@ -51,10 +51,13 @@ class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['ShowSQL'] = true;
$GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
$GLOBALS['cfg']['LimitChars'] = 100;
$GLOBALS['cfg']['Server']['pmadb'] = 'pmadb';
$GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
$GLOBALS['cfg']['Server']['user'] = 'user';
$GLOBALS['table'] = "table";
$GLOBALS['pmaThemeImage'] = 'image';
//$_SESSION
$_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
$_SESSION['PMA_Theme'] = new PMA_Theme();
@ -138,7 +141,7 @@ class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase
$count = 3;
//expects functions
$dbi->expects($this->once())->method('query')
$dbi->expects($this->exactly(2))->method('query')
->will($this->returnValue($result));
$dbi->expects($this->once())->method('numRows')

3
test/libraries/PMA_server_privileges_test.php
View File

@ -65,6 +65,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "db_structure.php";
$GLOBALS['cfg']['Confirm'] = "Confirm";
$GLOBALS['cfg']['ShowHint'] = true;
$GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
$GLOBALS['cfg']['Server']['user'] = 'user';
$GLOBALS['cfgRelation'] = array();
$GLOBALS['cfgRelation']['menuswork'] = false;
@ -76,6 +78,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$GLOBALS['username'] = "username";
$GLOBALS['collation_connection'] = "collation_connection";
$GLOBALS['text_dir'] = "text_dir";
$GLOBALS['default_query'] = true;
//$_POST
$_POST['pred_password'] = 'none';