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:
+14
-18
@@ -14,22 +14,18 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
namespace core;
|
||||
|
||||
/**
|
||||
* Authentication related tests.
|
||||
*
|
||||
* @package core_auth
|
||||
* @category phpunit
|
||||
* @package core
|
||||
* @category test
|
||||
* @copyright 2012 Petr Skoda {@link http://skodak.org}
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
|
||||
/**
|
||||
* Functional test for authentication related APIs.
|
||||
*/
|
||||
class core_authlib_testcase extends advanced_testcase {
|
||||
class authlib_test extends \advanced_testcase {
|
||||
public function test_lockout() {
|
||||
global $CFG;
|
||||
require_once("$CFG->libdir/authlib.php");
|
||||
@@ -347,7 +343,7 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
$result = authenticate_user_login('username4', 'a', false, $reason);
|
||||
$events = $sink->get_events();
|
||||
$sink->close();
|
||||
$notifications = \core\notification::fetch();
|
||||
$notifications = notification::fetch();
|
||||
$this->assertInstanceOf('stdClass', $result);
|
||||
$this->assertEquals(AUTH_LOGIN_OK, $reason);
|
||||
$this->assertEquals(get_user_preferences('auth_forcepasswordchange', false, $result), false);
|
||||
@@ -370,7 +366,7 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
$this->assertEquals(count($events), 1);
|
||||
$this->assertEquals(reset($events)->eventname, '\core\event\user_password_policy_failed');
|
||||
// Check notification fired.
|
||||
$notifications = \core\notification::fetch();
|
||||
$notifications = notification::fetch();
|
||||
$this->assertEquals(count($notifications), 1);
|
||||
|
||||
// Now the same tests with a user that passes the password policy.
|
||||
@@ -381,7 +377,7 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
$result = authenticate_user_login('username5', 'ThisPassword1sSecure!', false, $reason);
|
||||
$events = $sink->get_events();
|
||||
$sink->close();
|
||||
$notifications = \core\notification::fetch();
|
||||
$notifications = notification::fetch();
|
||||
$this->assertInstanceOf('stdClass', $result);
|
||||
$this->assertEquals(AUTH_LOGIN_OK, $reason);
|
||||
$this->assertEquals(get_user_preferences('auth_forcepasswordchange', false, $result), false);
|
||||
@@ -396,7 +392,7 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
$result = authenticate_user_login('username5', 'ThisPassword1sSecure!', false, $reason);
|
||||
$events = $sink->get_events();
|
||||
$sink->close();
|
||||
$notifications = \core\notification::fetch();
|
||||
$notifications = notification::fetch();
|
||||
$this->assertInstanceOf('stdClass', $result);
|
||||
$this->assertEquals(AUTH_LOGIN_OK, $reason);
|
||||
$this->assertEquals(get_user_preferences('auth_forcepasswordchange', false, $result), false);
|
||||
@@ -410,7 +406,7 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
try {
|
||||
$event = \core\event\user_loggedin::create(array('objectid' => 1));
|
||||
$this->fail('\core\event\user_loggedin requires other[\'username\']');
|
||||
} catch(Exception $e) {
|
||||
} catch(\Exception $e) {
|
||||
$this->assertInstanceOf('coding_exception', $e);
|
||||
}
|
||||
}
|
||||
@@ -434,8 +430,8 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
// inject our own validation method here and revert it back once we are done. This custom validator method is
|
||||
// identical to the default 'php' validator with the only difference: it has the FILTER_FLAG_EMAIL_UNICODE set
|
||||
// so that it allows to use non-ASCII characters in email addresses.
|
||||
$defaultvalidator = moodle_phpmailer::$validator;
|
||||
moodle_phpmailer::$validator = function($address) {
|
||||
$defaultvalidator = \moodle_phpmailer::$validator;
|
||||
\moodle_phpmailer::$validator = function($address) {
|
||||
return (bool) filter_var($address, FILTER_VALIDATE_EMAIL, FILTER_FLAG_EMAIL_UNICODE);
|
||||
};
|
||||
|
||||
@@ -472,6 +468,6 @@ class core_authlib_testcase extends advanced_testcase {
|
||||
$this->assertArrayNotHasKey('email', $errors);
|
||||
|
||||
// Restore the original email address validator.
|
||||
moodle_phpmailer::$validator = $defaultvalidator;
|
||||
\moodle_phpmailer::$validator = $defaultvalidator;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user