L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-32323 minor phpunit related improvements and cleanup

Browse Source
This commit is contained in:
Petr Skoda
2012-04-10 15:27:01 +02:00
parent 7b0ff21385
commit 6e2cff2d81
8 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/phpunit/cli/util.php
+1 -1
View File
@@ -20,7 +20,7 @@
* Exit codes:
* 0 - success
* 1 - general error
* 130 - missing PHPUnit error
* 130 - missing PHPUnit library error
* 131 - configuration problem
* 132 - install new test database
* 133 - drop existing data before installing
admin/tool/phpunit/index.php
-2
View File
@@ -22,8 +22,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
define('NO_OUTPUT_BUFFERING', true);
require(dirname(__FILE__) . '/../../../config.php');
require_once($CFG->libdir.'/adminlib.php');
admin/tool/phpunit/settings.php
+5 -3
View File
@@ -25,6 +25,8 @@
defined('MOODLE_INTERNAL') || die;
$ADMIN->add('development', new admin_externalpage('toolphpunit', get_string('pluginname', 'tool_phpunit'), "$CFG->wwwroot/$CFG->admin/tool/phpunit/index.php"));
$ADMIN->add('development', new admin_externalpage('toolphpunitwebrunner', get_string('pluginname', 'tool_phpunit'), "$CFG->wwwroot/$CFG->admin/tool/phpunit/webrunner.php",
'moodle/site:config', true));
if ($hassiteconfig) {
$ADMIN->add('development', new admin_externalpage('toolphpunit', get_string('pluginname', 'tool_phpunit'), "$CFG->wwwroot/$CFG->admin/tool/phpunit/index.php"));
$ADMIN->add('development', new admin_externalpage('toolphpunitwebrunner', get_string('pluginname', 'tool_phpunit'), "$CFG->wwwroot/$CFG->admin/tool/phpunit/webrunner.php",
'moodle/site:config', true));
}
admin/tool/phpunit/version.php
+2 -2
View File
@@ -24,7 +24,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2012030800; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2012030100; // Requires this Moodle version
$plugin->version = 2012040500; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2012040500; // Requires this Moodle version
$plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)
admin/tool/phpunit/webrunner.php
+4 -6
View File
@@ -30,7 +30,6 @@ require_once($CFG->libdir.'/adminlib.php');
$path = optional_param('path', null, PARAM_PATH);
$execute = optional_param('execute', 0, PARAM_BOOL);
navigation_node::override_active_url(new moodle_url('/admin/tool/phpunit/index.php'));
admin_externalpage_setup('toolphpunitwebrunner');
@@ -64,7 +63,6 @@ if ($code != 0) {
}
if ($execute) {
require_sesskey();
chdir($CFG->dirroot);
@@ -95,7 +93,6 @@ if ($execute) {
} else if ($code == 133) {
tool_phpunit_header();
ignore_user_abort(true);
echo $OUTPUT->box_start('generalbox');
echo '<pre>';
echo "Reinitialising test database:\n\n";
@@ -130,7 +127,6 @@ if ($execute) {
echo $OUTPUT->box_start('generalbox');
echo '<pre>';
chdir($CFG->dirroot);
// use the dataroot file
$configdir = "$CFG->phpunit_dataroot/phpunit/webrunner.xml";
if (!file_exists($configdir)) {
@@ -143,6 +139,7 @@ if ($execute) {
// cleanup the path - this is tricky because we can not use quotes for escaping
$path = escapeshellcmd($path);
$path = str_replace('\*', '*', $path);
chdir($CFG->dirroot);
passthru("phpunit -c $configdir $path", $code);
chdir($oldcwd);
@@ -173,7 +170,8 @@ die;
//========================================
/**
* Print headers and warning
* Print headers and experimental warning
* @return void
*/
function tool_phpunit_header() {
global $OUTPUT;
@@ -188,7 +186,7 @@ function tool_phpunit_header() {
* @return void
*/
function tool_phpunit_problem($message) {
global $OUTPUT, $PAGE;
global $PAGE;
if (!$PAGE->headerprinted) {
tool_phpunit_header();
}