Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/tests/unit test.php,1.22,1.23
|
From: Reini U. <ru...@us...> - 2004-10-20 13:06:25
|
Update of /cvsroot/phpwiki/phpwiki/tests/unit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22873 Modified Files: test.php Log Message: use config.ini for SQL settings, extra test per unit to reset timeout and avoid PHPUnit mem.overhead Index: test.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/tests/unit/test.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -2 -b -p -d -r1.22 -r1.23 --- test.php 19 Oct 2004 21:14:58 -0000 1.22 +++ test.php 20 Oct 2004 13:06:16 -0000 1.23 @@ -50,19 +50,4 @@ define('RATING_STORAGE', 'WIKIPAGE'); //define('USECACHE', false); -// available database backends to test: -$database_backends = array( - 'file', - 'dba', - 'SQL', - 'ADODB', - ); -// "flatfile" testing occurs in "tests/unit/.testbox/" -// "dba" needs the DATABASE_DBA_HANDLER, also in the .textbox directory -$database_dba_handler = (substr(PHP_OS,0,3) == 'WIN') ? "db3" : "gdbm"; -// "SQL" and "ADODB" need delete permissions to the test db -// You have to create that database beforehand with our schema -$database_dsn = "mysql://wikiuser:@localhost/phpwiki_test"; -// For "cvs" see the seperate tests/unit_test_backend_cvs.php - #################################################################### # @@ -84,7 +69,24 @@ if ($HTTP_SERVER_VARS["SERVER_NAME"] == //define('ENABLE_PAGEPERM',false); // costs nothing define('USECACHE',false); - define('WIKIDB_NOCACHE_MARKUP',1); + //define('WIKIDB_NOCACHE_MARKUP',1); } +// available database backends to test: +$database_backends = array( + 'file', + 'dba', + 'SQL', + 'ADODB', + ); +//TODO: read some database values from config.ini, just use the "test_" prefix +// "flatfile" testing occurs in "tests/unit/.testbox/" +// "dba" needs the DATABASE_DBA_HANDLER, also in the .textbox directory +//$database_dba_handler = (substr(PHP_OS,0,3) == 'WIN') ? "db3" : "gdbm"; +// "SQL" and "ADODB" need delete permissions to the test db +// You have to create that database beforehand with our schema +//$database_dsn = "mysql://wikiuser:@localhost/phpwiki"; +$database_prefix = "test_"; +// For "cvs" see the seperate tests/unit_test_backend_cvs.php + # Quiet warnings in IniConfig.php $HTTP_SERVER_VARS['REMOTE_ADDR'] = '127.0.0.1'; @@ -93,4 +95,5 @@ $HTTP_SERVER_VARS['HTTP_USER_AGENT'] = " function printMemoryUsage($msg = '') { static $mem = 0; + static $initmem = 0; if ($msg) echo $msg,"\n"; if ((defined('DEBUG') and (DEBUG & 8)) or !defined('DEBUG')) { @@ -120,5 +123,8 @@ function printMemoryUsage($msg = '') { $mem = (integer) trim($memstr); } - echo sprintf("%8d (%+4d)\n", $mem, $mem - $oldmem); + if (!$initmem) $initmem = $mem; + // old libc on sf.net server doesn't understand "%+4d" + echo sprintf("%8d\t[%s%4d]\t[+%4d]\n", $mem, $mem > $oldmem ? "+" : ($mem == $oldmem ? " " : ""), $mem - $oldmem, $mem - $initmem); + // TODO: print time flush(); } @@ -189,10 +195,10 @@ function purge_dir($dir) { function purge_testbox() { - global $db_params; + global $DBParams; if (isset($GLOBALS['request'])) { $dbi = $GLOBALS['request']->getDbh(); } - $dir = $db_params['directory']; - switch ($db_params['dbtype']) { + $dir = $DBParams['directory']; + switch ($DBParams['dbtype']) { case 'file': assert(!empty($dir)); @@ -274,4 +280,6 @@ if (!empty($argv)) { $alltests = $runtests; if ($debug_level & 1) { + echo "PHP_OS=",PHP_OS, "\n"; + echo "PHP_VERSION=",PHP_VERSION, "\n"; echo "test=", join(",",$alltests),"\n"; echo "db=", join(",",$database_backends),"\n"; @@ -302,6 +310,5 @@ require_once $rootdir.'lib/main.php'; if ($debug_level & 9) { - echo "PHP_OS: ",PHP_OS, "\n"; - echo "PHP_VERSION: ",PHP_VERSION, "\n"; + // which constants affect memory? foreach (explode(",","ENABLE_PAGEPERM,USECACHE,WIKIDB_NOCACHE_MARKUP") as $v) echo "$v=",(defined($v) and constant($v)) ? constant($v) : "false","\n"; @@ -362,5 +369,5 @@ include_once("themes/" . THEME . "/theme if (DEBUG & _DEBUG_TRACE) - printMemoryUsage("after PhpWiki, before tests"); + printMemoryUsage("PhpWiki loaded, not initialized"); // save and restore all args for each test. @@ -386,16 +393,21 @@ class phpwiki_TestCase extends PHPUnit_T foreach ($database_backends as $dbtype) { - $suite = new PHPUnit_TestSuite("phpwiki"); + // if (DEBUG & _DEBUG_TRACE) + // printMemoryUsage("PHPUnit initialized"); - $db_params = array(); - $db_params['directory'] = $cur_dir . '/.testbox'; - $db_params['dsn'] = $database_dsn; - $db_params['dba_handler'] = $database_dba_handler; - $db_params['dbtype'] = $dbtype; + $DBParams['dbtype'] = $dbtype; + $DBParams['directory'] = $cur_dir . '/.testbox'; + $DBParams['prefix'] = $database_prefix; + // from config.ini + //$DBParams['dsn'] = $database_dsn; + //$DBParams['dba_handler'] = $database_dba_handler; echo "Testing DB Backend \"$dbtype\" ...\n"; - $request = new MockRequest($db_params); + $request = new MockRequest($DBParams); + if (DEBUG & _DEBUG_TRACE) + printMemoryUsage("PhpWiki initialized"); foreach ($alltests as $test) { + $suite = new PHPUnit_TestSuite("phpwiki"); if (file_exists(dirname(__FILE__).'/lib/'.$test.'.php')) require_once dirname(__FILE__).'/lib/'.$test.'.php'; @@ -403,14 +415,17 @@ foreach ($database_backends as $dbtype) require_once dirname(__FILE__).'/lib/plugin/'.$test.'.php'; $suite->addTest( new PHPUnit_TestSuite($test) ); - } + @set_time_limit(240); $result = PHPUnit::run($suite); echo "ran " . $result->runCount() . " tests, " . $result->failureCount() . " failures.\n"; flush(); - if ($result->failureCount() > 0) { echo "More detail:\n"; echo $result->toString(); } + } + unset($request); + unset($suite); + unset($result); } |