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

MDL-32323 improve PHPUnit related diagnotic messages

Browse Source
This commit is contained in:
Petr Skoda 2012-04-07 23:56:45 +02:00
parent e10736b3cc
commit b6b8a19316
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/tool/phpunit/cli/init.bat
View File

@ -1,4 +1,6 @@
@ECHO OFF
ECHO Initialising Moodle PHPUnit test environment...
CALL php %~dp0\util.php --diag > NUL 2>&1
IF ERRORLEVEL 133 GOTO drop

2
admin/tool/phpunit/cli/init.sh
View File

@ -6,7 +6,7 @@ CLIDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
UTIL="$CLIDIR/util.php"
echo "Initialising test database and creating phpunit.xml configuration..."
echo "Initialising Moodle PHPUnit test environment..."
DIGERROR=`php $UTIL --diag`
DIAG=$?

4
lib/phpunit/bootstraplib.php
View File

@ -45,10 +45,10 @@ function phpunit_bootstrap_error($errorcode, $text = '') {
$text = 'Configuration problem: '.$text;
break;
case 132:
$text = 'Database was not initialised to run unit tests, please use "php admin/tool/phpunit/cli/util.php --install"';
$text = "Moodle PHPUnit environment is not initialised, please use:\n php admin/tool/phpunit/cli/util.php --install";
break;
case 133:
$text = 'Database was initialised for different version, please use "php admin/tool/phpunit/cli/util.php --drop; php admin/tool/phpunit/cli/util.php --install"';
$text = "Moodle PHPUnit environment was initialised for different version, please use:\n php admin/tool/phpunit/cli/util.php --drop\n php admin/tool/phpunit/cli/util.php --install";
break;
case 134:
$text = 'Can not create main configuration file, please verify dirroot permissions.';

4
lib/phpunit/lib.php
View File

@ -673,9 +673,9 @@ class phpunit_util {
if ($DB->get_tables()) {
list($errorcode, $message) = phpunit_util::testing_ready_problem();
if ($errorcode) {
phpunit_bootstrap_error(133, 'Database tables already installed, drop the site first.');
phpunit_bootstrap_error(133, 'Database tables already present, Moodle PHPUnit test environment can not be initialised');
} else {
phpunit_bootstrap_error(0, 'Test database is already initialised');
phpunit_bootstrap_error(0, 'Moodle PHPUnit test environment is already initialised');
}
}