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

MDL-75111 phpunit: Move tests to use correct names and ns (take#4)

Browse Source 
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)
2022-08-26 16:34:28 +02:00
parent 376e57d267
commit 61cedbd56e
125 changed files with 2441 additions and 2725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/message_test.php
+35 -44
View File
@@ -14,28 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Test classes for \core\message\message.
*
* @package core_message
* @category test
* @copyright 2015 onwards Ankit Agarwal
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
namespace core;
/**
* Test script for message class.
*
* @package core_message
* Test classes for \core\message\message.
*
* @package core
* @category test
* @copyright 2015 onwards Ankit Agarwal
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_message_testcase extends advanced_testcase {
class message_test extends \advanced_testcase {
/**
* Test the method get_eventobject_for_processor().
@@ -68,8 +59,8 @@ class core_message_testcase extends advanced_testcase {
$message->set_additional_content('test', $content);
// Create a file instance.
$usercontext = context_user::instance($user->id);
$file = new stdClass;
$usercontext = \context_user::instance($user->id);
$file = new \stdClass;
$file->contextid = $usercontext->id;
$file->component = 'user';
$file->filearea = 'private';
@@ -82,49 +73,49 @@ class core_message_testcase extends advanced_testcase {
$file = $fs->create_file_from_string($file, 'file1 content');
$message->attachment = $file;
$stdclass = $message->get_eventobject_for_processor('test');
$stdClass = $message->get_eventobject_for_processor('test');
$this->assertSame($message->courseid, $stdclass->courseid);
$this->assertSame($message->component, $stdclass->component);
$this->assertSame($message->name, $stdclass->name);
$this->assertSame($message->userfrom, $stdclass->userfrom);
$this->assertSame($message->userto, $stdclass->userto);
$this->assertSame($message->subject, $stdclass->subject);
$this->assertSame(' test ' . $message->fullmessage . ' test ', $stdclass->fullmessage);
$this->assertSame(' test ' . $message->fullmessagehtml . ' test ', $stdclass->fullmessagehtml);
$this->assertSame(' test ' . $message->smallmessage . ' test ', $stdclass->smallmessage);
$this->assertSame($message->notification, $stdclass->notification);
$this->assertSame($message->contexturl, $stdclass->contexturl);
$this->assertSame($message->contexturlname, $stdclass->contexturlname);
$this->assertSame($message->replyto, $stdclass->replyto);
$this->assertSame($message->replytoname, $stdclass->replytoname);
$this->assertSame($message->attachname, $stdclass->attachname);
$this->assertSame($message->courseid, $stdClass->courseid);
$this->assertSame($message->component, $stdClass->component);
$this->assertSame($message->name, $stdClass->name);
$this->assertSame($message->userfrom, $stdClass->userfrom);
$this->assertSame($message->userto, $stdClass->userto);
$this->assertSame($message->subject, $stdClass->subject);
$this->assertSame(' test ' . $message->fullmessage . ' test ', $stdClass->fullmessage);
$this->assertSame(' test ' . $message->fullmessagehtml . ' test ', $stdClass->fullmessagehtml);
$this->assertSame(' test ' . $message->smallmessage . ' test ', $stdClass->smallmessage);
$this->assertSame($message->notification, $stdClass->notification);
$this->assertSame($message->contexturl, $stdClass->contexturl);
$this->assertSame($message->contexturlname, $stdClass->contexturlname);
$this->assertSame($message->replyto, $stdClass->replyto);
$this->assertSame($message->replytoname, $stdClass->replytoname);
$this->assertSame($message->attachname, $stdClass->attachname);
// Extra content for fullmessage only.
$content = array('fullmessage' => array('header' => ' test ', 'footer' => ' test '));
$message->set_additional_content('test', $content);
$stdclass = $message->get_eventobject_for_processor('test');
$this->assertSame(' test ' . $message->fullmessage . ' test ', $stdclass->fullmessage);
$this->assertSame($message->fullmessagehtml, $stdclass->fullmessagehtml);
$this->assertSame($message->smallmessage, $stdclass->smallmessage);
$stdClass = $message->get_eventobject_for_processor('test');
$this->assertSame(' test ' . $message->fullmessage . ' test ', $stdClass->fullmessage);
$this->assertSame($message->fullmessagehtml, $stdClass->fullmessagehtml);
$this->assertSame($message->smallmessage, $stdClass->smallmessage);
// Extra content for fullmessagehtml and smallmessage only.
$content = array('fullmessagehtml' => array('header' => ' test ', 'footer' => ' test '),
'smallmessage' => array('header' => ' testsmall ', 'footer' => ' testsmall '));
$message->set_additional_content('test', $content);
$stdclass = $message->get_eventobject_for_processor('test');
$this->assertSame($message->fullmessage, $stdclass->fullmessage);
$this->assertSame(' test ' . $message->fullmessagehtml . ' test ', $stdclass->fullmessagehtml);
$this->assertSame(' testsmall ' . $message->smallmessage . ' testsmall ', $stdclass->smallmessage);
$stdClass = $message->get_eventobject_for_processor('test');
$this->assertSame($message->fullmessage, $stdClass->fullmessage);
$this->assertSame(' test ' . $message->fullmessagehtml . ' test ', $stdClass->fullmessagehtml);
$this->assertSame(' testsmall ' . $message->smallmessage . ' testsmall ', $stdClass->smallmessage);
// Extra content for * and smallmessage.
$content = array('*' => array('header' => ' test ', 'footer' => ' test '),
'smallmessage' => array('header' => ' testsmall ', 'footer' => ' testsmall '));
$message->set_additional_content('test', $content);
$stdclass = $message->get_eventobject_for_processor('test');
$this->assertSame(' test ' . $message->fullmessage . ' test ', $stdclass->fullmessage);
$this->assertSame(' test ' . $message->fullmessagehtml . ' test ', $stdclass->fullmessagehtml);
$this->assertSame(' testsmall ' . ' test ' . $message->smallmessage . ' test ' . ' testsmall ', $stdclass->smallmessage);
$stdClass = $message->get_eventobject_for_processor('test');
$this->assertSame(' test ' . $message->fullmessage . ' test ', $stdClass->fullmessage);
$this->assertSame(' test ' . $message->fullmessagehtml . ' test ', $stdClass->fullmessagehtml);
$this->assertSame(' testsmall ' . ' test ' . $message->smallmessage . ' test ' . ' testsmall ', $stdClass->smallmessage);
}
/**