mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-17534 simpletest: temporary fix for exception problems

Browse Source
This commit is contained in:
skodak 2008-12-04 23:19:37 +00:00
parent 9d833e931c
commit 995821591d
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/simpletestlib/errors.php
View File

@ -46,9 +46,20 @@ class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
function invoke($method) {
$queue = &$this->_createErrorQueue();
set_error_handler('SimpleTestErrorHandler');
parent::invoke($method);
//moodle hack start
// note: this breaks PHP4 compatibility!
$rethrow = null;
try {
parent::invoke($method);
} catch (Exception $e) {
$rethrow = $e;
}
restore_error_handler();
$queue->tally();
if ($rethrow) {
throw $rethrow;
}
//moodle hack end
}
/**

13
lib/simpletestlib/invoker.php
View File

@ -65,8 +65,19 @@ class SimpleInvoker {
*/
function invoke($method) {
$this->_test_case->setUp();
$this->_test_case->$method();
// moodle hack start
// note: this breaks PHP4 compatibility!
$rethrow = null;
try {
$this->_test_case->$method();
} catch (Exception $e) {
$rethrow = $e;
}
$this->_test_case->tearDown();
if ($rethrow) {
throw $rethrow;
}
// moodle hack end
}
/**

1
lib/simpletestlib/readme_moodle.txt
View File

@ -2,6 +2,7 @@ Description of Simpletest 1.0.1beta library import into Moodle
Changes:
* test_case.php - added our global $CFG before include() MDL-10064
* fixed exception support (MDL-17534) - try/catch in invoker.php and errors.php
skodak