MDL-75111 phpunit: Move tests to use correct names and ns (take#4)
Applied the following changes to various testcase classes: - Namespaced with component[\level2-API] - Moved to level2-API subdirectory when required. - Fixed incorrect use statements with leading backslash. - Remove file phpdoc block - Remove MOODLE_INTERNAL if not needed. - Changed code to point to global scope when needed. - Fix some relative paths and comments here and there. - All them passing individually. - Complete runs passing too. Special mention to: - The following task tests have been moved within the level2 directory: - \core\adhoc_task_test => \core\task\adhoc_task_test - \core\scheduled_task_test => \core\task\scheduled_task_test - \core\calendar_cron_task_test => \core\task\calendar_cron_task_test - \core\h5p_get_content_types_task_test => \core\task\h5p_get_content_types_task_test - \core\task_database_logger_test => \core\task\database_logger_test - \core\task_logging_test => \core\task\logging_test - The following event tests have been moved within level2 directory: - \core\event_context_locked_test => \core\event\context_locked_test - \core\event_deprecated_test => \core\event\deprecated_test - \core\event_grade_deleted_test => \core\event\grade_deleted_test - \core\event_profile_field_test => \core\event\profile_field_test - \core\event_unknown_logged_test => \core\event\unknown_logged_test - \core\event_user_graded_test => \core\event\user_graded_test - \core\event_user_password_updated_test => \core\event\user_password_updated_test - The following output tests have been moved within level2 directory: - \core\mustache_template_finder_test => \core\output\mustache_template_finder_test - \core\mustache_template_source_loader_test => \core\output\mustache_template_source_loader_test - \core\output_mustache_helper_collection_test => \core\output\mustache_helper_collection_test - The following tests have been moved to their correct tests directories: - lib/tests/time_splittings_test.php => analytics/tests/time_splittings_test.php - All the classes and tests under lib/filebrowser and lib/filestorage belong to core, not to core_files. Some day we should move them to their correct subsystem. - All the classes and tests under lib/grade belong to core, not to core_grades. Some day we should move them to their correct subsystem. - The core_grades_external class and its \core\grades_external_test unit test should belong to the grades subsystem or, alternatively, to \core\external, they both should be moved together. - The core_grading_external class and its \core\grading_external_test unit test should belong to the grading subsystem or, alternatively, to \core\external, they both should be moved together. - The \core\message\message and \core\message\inbound (may be others) classes, and their associated tests should go to the core_message subsystem. - The core_user class, and its associated tests should go to the core_user subsystem. - The \core\update namespace is plain wrong (update is not valid API) and needs action 1) create it or 2) move elsewhere.
This commit is contained in:
Eloy Lafuente (stronk7)
+21
-23
@@ -14,14 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* Tests for ../statslib.php
|
||||
*
|
||||
* @package core_stats
|
||||
* @category phpunit
|
||||
* @copyright 2012 Tyler Bannister
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
namespace core;
|
||||
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
@@ -33,8 +26,13 @@ require_once(__DIR__ . '/fixtures/stats_events.php');
|
||||
|
||||
/**
|
||||
* Test functions that affect daily stats.
|
||||
*
|
||||
* @package core
|
||||
* @category test
|
||||
* @copyright 2012 Tyler Bannister
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class core_statslib_testcase extends advanced_testcase {
|
||||
class statslib_test extends \advanced_testcase {
|
||||
/** The day to use for testing **/
|
||||
const DAY = 1272672000;
|
||||
|
||||
@@ -58,14 +56,14 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
|
||||
// Settings to force statistic to run during testing.
|
||||
$this->setTimezone(self::TIMEZONE);
|
||||
core_date::set_default_server_timezone();
|
||||
\core_date::set_default_server_timezone();
|
||||
$CFG->statsfirstrun = 'all';
|
||||
$CFG->statslastdaily = 0;
|
||||
|
||||
// Figure out the broken day start so I can figure out when to the start time should be.
|
||||
$time = time();
|
||||
// This nonsense needs to be rewritten.
|
||||
$date = new DateTime('now', core_date::get_server_timezone_object());
|
||||
$date = new \DateTime('now', \core_date::get_server_timezone_object());
|
||||
$offset = $date->getOffset();
|
||||
$stime = $time + $offset;
|
||||
$stime = intval($stime / (60*60*24)) * 60*60*24;
|
||||
@@ -307,7 +305,7 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
$dataset = $this->load_xml_data_file(__DIR__."/fixtures/statslib-test01.xml");
|
||||
$DB->delete_records('log');
|
||||
|
||||
$date = new DateTime('now', core_date::get_server_timezone_object());
|
||||
$date = new \DateTime('now', \core_date::get_server_timezone_object());
|
||||
$day = self::DAY - $date->getOffset();
|
||||
|
||||
$CFG->statsfirstrun = 'all';
|
||||
@@ -347,22 +345,22 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
$this->assertEquals($firstoldtime, stats_get_start_from('daily'));
|
||||
|
||||
$time = time() - 5;
|
||||
\core_tests\event\create_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\create_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
$DB->set_field('logstore_standard_log', 'timecreated', $time++, [
|
||||
'eventname' => '\\core_tests\\event\\create_executed',
|
||||
]);
|
||||
|
||||
\core_tests\event\read_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\read_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
$DB->set_field('logstore_standard_log', 'timecreated', $time++, [
|
||||
'eventname' => '\\core_tests\\event\\read_executed',
|
||||
]);
|
||||
|
||||
\core_tests\event\update_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\update_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
$DB->set_field('logstore_standard_log', 'timecreated', $time++, [
|
||||
'eventname' => '\\core_tests\\event\\update_executed',
|
||||
]);
|
||||
|
||||
\core_tests\event\delete_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\delete_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
$DB->set_field('logstore_standard_log', 'timecreated', $time++, [
|
||||
'eventname' => '\\core_tests\\event\\delete_executed',
|
||||
]);
|
||||
@@ -571,7 +569,7 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
$this->prepare_db($dataset, array('log'));
|
||||
|
||||
// This nonsense needs to be rewritten.
|
||||
$date = new DateTime('now', core_date::get_server_timezone_object());
|
||||
$date = new \DateTime('now', \core_date::get_server_timezone_object());
|
||||
$start = self::DAY - $date->getOffset();
|
||||
$end = $start + (24 * 3600);
|
||||
|
||||
@@ -588,8 +586,8 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
stats_temp_table_create();
|
||||
|
||||
$course = $this->getDataGenerator()->create_course();
|
||||
$context = context_course::instance($course->id);
|
||||
$fcontext = context_course::instance(SITEID);
|
||||
$context = \context_course::instance($course->id);
|
||||
$fcontext = \context_course::instance(SITEID);
|
||||
$user = $this->getDataGenerator()->create_user();
|
||||
$this->setUser($user);
|
||||
|
||||
@@ -603,8 +601,8 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
|
||||
\core_tests\event\create_executed::create(array('context' => $fcontext, 'courseid' => SITEID))->trigger();
|
||||
\core_tests\event\read_executed::create(array('context' => $context, 'courseid' => $course->id))->trigger();
|
||||
\core_tests\event\update_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\delete_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\update_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
\core_tests\event\delete_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
|
||||
\core\event\user_loggedin::create(
|
||||
array(
|
||||
@@ -618,8 +616,8 @@ class core_statslib_testcase extends advanced_testcase {
|
||||
|
||||
$this->assertEquals(5, $DB->count_records('logstore_standard_log'));
|
||||
|
||||
\core_tests\event\delete_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\delete_executed::create(array('context' => context_system::instance()))->trigger();
|
||||
\core_tests\event\delete_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
\core_tests\event\delete_executed::create(array('context' => \context_system::instance()))->trigger();
|
||||
|
||||
// Fake the origin of events.
|
||||
$DB->set_field('logstore_standard_log', 'origin', 'web', array());
|
||||
|
||||
Reference in New Issue
Block a user