MDL-19579 code coverage - initial frontend for both unit and db tests

diff --git a/admin/report/unittest/dbtest.php b/admin/report/unittest/dbtest.php
index f59eda70e541c7b9a5640320683d2ed57945ae53..a2468e82a5b45f6dfc533620554e0e198f079fe5 100644 (file)
--- a/admin/report/unittest/dbtest.php
+++ b/admin/report/unittest/dbtest.php
@@ -7,12 +7,13 @@
 /** */
 require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/simpletestlib.php');
+require_once($CFG->libdir.'/simpletestcoveragelib.php');
 require_once('ex_simple_test.php');
 require_once('ex_reporter.php');
 
-$showpasses = optional_param('showpasses', 0, PARAM_BOOL);
-$selected   = optional_param('selected', array(), PARAM_INT);
+$showpasses   = optional_param('showpasses', false, PARAM_BOOL);
+$codecoverage = optional_param('codecoverage', false, PARAM_BOOL);
+$selected     = optional_param('selected', array(), PARAM_INT);
 
 // Print the header and check access.
 admin_externalpage_setup('reportdbtest');
@@ -67,6 +68,9 @@ if (!empty($tests)) {
     @ob_implicit_flush(true);
     while(@ob_end_flush());
 
+    $covreporter = new moodle_coverage_reporter('Functional DB Tests Code Coverage Report', 'dbtest');
+    $covrecorder = new moodle_coverage_recorder($covreporter);
+
     foreach ($tests as $i=>$database) {
         $dbinfo = $dbinfos[$i];
 
@@ -75,7 +79,8 @@ if (!empty($tests)) {
         print_heading('Running tests on: '.$dbinfo['name'], '', 3); // TODO: localise
 
         // Create the group of tests.
-        $test = new AutoGroupTest(false, true);
+        $test = new autogroup_test_coverage(false, true, $codecoverage);
+
 
         $test->addTestFile($CFG->libdir.'/dml/simpletest/testdml.php');
         $test->addTestFile($CFG->libdir.'/ddl/simpletest/testddl.php');
@@ -83,13 +88,17 @@ if (!empty($tests)) {
         // Make the reporter, which is what displays the results.
         $reporter = new ExHtmlReporter($showpasses);
 
-        set_time_limit(300);
-        $test->run($reporter);
+        set_time_limit(300); // 5 mins per DB should be enough
+        $test->run_with_external_coverage($reporter, $covrecorder);
 
         unset($UNITTEST->func_test_db);
 
         echo '<hr />';
     }
+    if ($codecoverage) {
+        $covrecorder->generate_report();
+        moodle_coverage_reporter::print_summary_info('dbtest');
+    }
 
 }
 
@@ -99,6 +108,11 @@ echo '<form method="post" action="dbtest.php">';
 echo '<div>';
 print_heading("Run functional database tests"); // TODO: localise
 echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', 'simpletest')); echo '</p>';
+if (moodle_coverage_recorder::can_run_codecoverage()) {
+    echo '<p>'; print_checkbox('codecoverage', 1, $codecoverage, get_string('codecoverageanalysis', 'simpletest')); echo '</p>';
+} else {
+    echo '<p>'; print_string('codecoveragedisabled', 'simpletest'); echo '<input type="hidden" name="codecoverage" value="0" /></p>';
+}
 echo '<p><strong>'."Databases:".'</strong>';
 echo '<ul>';
 foreach ($dbinfos as $i=>$dbinfo) {

diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php
index 671e2116ab9a5c343fdb55a0a8ce99e33f660c0d..1b7edba56d306f5b233f83a7f4fb4277f9b9e042 100644 (file)
--- a/admin/report/unittest/index.php
+++ b/admin/report/unittest/index.php
@@ -12,7 +12,7 @@
 /** */
 require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/simpletestlib.php');
+require_once($CFG->libdir.'/simpletestcoveragelib.php');
 require_once('ex_simple_test.php');
 require_once('ex_reporter.php');
 
@@ -22,9 +22,10 @@ error_reporting($CFG->debug);
 raise_memory_limit('256M');
 
 // page parameters
-$path                    = optional_param('path', null, PARAM_PATH);
-$showpasses              = optional_param('showpasses', false, PARAM_BOOL);
-$showsearch              = optional_param('showsearch', false, PARAM_BOOL);
+$path         = optional_param('path', null, PARAM_PATH);
+$showpasses   = optional_param('showpasses', false, PARAM_BOOL);
+$codecoverage = optional_param('codecoverage', false, PARAM_BOOL);
+$showsearch   = optional_param('showsearch', false, PARAM_BOOL);
 
 admin_externalpage_setup('reportsimpletest', '', array('showpasses'=>$showpasses, 'showsearch'=>$showsearch));
 
@@ -46,7 +47,7 @@ if (!is_null($path)) {
     unset($origxmlstrictheaders);
 
     // Create the group of tests.
-    $test = new AutoGroupTest($showsearch);
+    $test = new autogroup_test_coverage($showsearch, true, $codecoverage, 'Moodle Unit Tests Code Coverage Report', 'unittest');
 
     // OU specific. We use the _nonproject folder for stuff we want to
     // keep in CVS, but which is not really relevant. It does no harm
@@ -88,6 +89,7 @@ if (!is_null($path)) {
             $title = get_string('moodleunittests', $langfile, $displaypath);
         }
         print_heading($title);
+        set_time_limit(300); // 5 mins
         $test->run($reporter);
     }
 
@@ -104,6 +106,11 @@ echo '<form method="get" action="index.php">';
 echo '<fieldset class="invisiblefieldset">';
 echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', $langfile)); echo '</p>';
 echo '<p>'; print_checkbox('showsearch', 1, $showsearch, get_string('showsearch', $langfile)); echo '</p>';
+if (moodle_coverage_recorder::can_run_codecoverage()) {
+    echo '<p>'; print_checkbox('codecoverage', 1, $codecoverage, get_string('codecoverageanalysis', 'simpletest')); echo '</p>';
+} else {
+    echo '<p>'; print_string('codecoveragedisabled', 'simpletest'); echo '<input type="hidden" name="codecoverage" value="0" /></p>';
+}
 echo '<p>';
     echo '<label for="path">', get_string('onlytest', $langfile), '</label> ';
     echo '<input type="text" id="path" name="path" value="', $displaypath, '" size="40" />';