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)
@@ -14,26 +14,17 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* Unit tests for session manager class.
|
||||
*
|
||||
* @package core
|
||||
* @category phpunit
|
||||
* @copyright 2013 Petr Skoda {@link http://skodak.org}
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
namespace core;
|
||||
|
||||
/**
|
||||
* Unit tests for session manager class.
|
||||
*
|
||||
* @package core
|
||||
* @category phpunit
|
||||
* @category test
|
||||
* @copyright 2013 Petr Skoda {@link http://skodak.org}
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class core_session_manager_testcase extends advanced_testcase {
|
||||
class session_manager_test extends \advanced_testcase {
|
||||
public function test_start() {
|
||||
$this->resetAfterTest();
|
||||
// Session must be started only once...
|
||||
@@ -80,7 +71,7 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
$this->assertSame($GLOBALS['SESSION'], $_SESSION['SESSION']);
|
||||
$this->assertSame($GLOBALS['SESSION'], $SESSION);
|
||||
|
||||
$_SESSION['SESSION'] = new stdClass();
|
||||
$_SESSION['SESSION'] = new \stdClass();
|
||||
$_SESSION['SESSION']->test3 = true;
|
||||
$this->assertSame($GLOBALS['SESSION'], $_SESSION['SESSION']);
|
||||
$this->assertSame($GLOBALS['SESSION'], $SESSION);
|
||||
@@ -95,7 +86,7 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
$this->assertSame($GLOBALS['USER'], $_SESSION['USER']);
|
||||
$this->assertSame($GLOBALS['USER'], $USER);
|
||||
|
||||
$_SESSION['USER'] = new stdClass();
|
||||
$_SESSION['USER'] = new \stdClass();
|
||||
$_SESSION['USER']->test3 = true;
|
||||
$this->assertSame($GLOBALS['USER'], $_SESSION['USER']);
|
||||
$this->assertSame($GLOBALS['USER'], $USER);
|
||||
@@ -189,7 +180,7 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
|
||||
$this->assertFalse(\core\session\manager::session_exists($sid));
|
||||
|
||||
$record = new stdClass();
|
||||
$record = new \stdClass();
|
||||
$record->userid = 0;
|
||||
$record->sid = $sid;
|
||||
$record->timecreated = time();
|
||||
@@ -568,10 +559,10 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
|
||||
// Try admin loginas this user in system context.
|
||||
$this->assertObjectNotHasAttribute('realuser', $USER);
|
||||
\core\session\manager::loginas($user->id, context_system::instance());
|
||||
\core\session\manager::loginas($user->id, \context_system::instance());
|
||||
|
||||
$this->assertSame($user->id, $USER->id);
|
||||
$this->assertEquals(context_system::instance(), $USER->loginascontext);
|
||||
$this->assertEquals(\context_system::instance(), $USER->loginascontext);
|
||||
$this->assertSame($adminuser->id, $USER->realuser);
|
||||
$this->assertSame($GLOBALS['USER'], $_SESSION['USER']);
|
||||
$this->assertSame($GLOBALS['USER'], $USER);
|
||||
@@ -590,7 +581,7 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
$this->setUser($user);
|
||||
$this->assertNotEquals($adminuser->id, $USER->id);
|
||||
$course = $this->getDataGenerator()->create_course();
|
||||
$coursecontext = context_course::instance($course->id);
|
||||
$coursecontext = \context_course::instance($course->id);
|
||||
|
||||
// Catch event triggered.
|
||||
$sink = $this->redirectEvents();
|
||||
@@ -624,7 +615,7 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
$this->assertFalse(\core\session\manager::is_loggedinas());
|
||||
|
||||
$this->setUser($user1);
|
||||
\core\session\manager::loginas($user2->id, context_system::instance());
|
||||
\core\session\manager::loginas($user2->id, \context_system::instance());
|
||||
|
||||
$this->assertTrue(\core\session\manager::is_loggedinas());
|
||||
}
|
||||
@@ -639,7 +630,7 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
$normal = \core\session\manager::get_realuser();
|
||||
$this->assertSame($GLOBALS['USER'], $normal);
|
||||
|
||||
\core\session\manager::loginas($user2->id, context_system::instance());
|
||||
\core\session\manager::loginas($user2->id, \context_system::instance());
|
||||
|
||||
$real = \core\session\manager::get_realuser();
|
||||
|
||||
@@ -857,12 +848,12 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
|
||||
public function test_array_session_diff_same_array() {
|
||||
$a = [];
|
||||
$a['c'] = new stdClass();
|
||||
$a['c']->o = new stdClass();
|
||||
$a['c']->o->o = new stdClass();
|
||||
$a['c'] = new \stdClass();
|
||||
$a['c']->o = new \stdClass();
|
||||
$a['c']->o->o = new \stdClass();
|
||||
$a['c']->o->o->l = 'cool';
|
||||
|
||||
$class = new ReflectionClass('\core\session\manager');
|
||||
$class = new \ReflectionClass('\core\session\manager');
|
||||
$method = $class->getMethod('array_session_diff');
|
||||
$method->setAccessible(true);
|
||||
|
||||
@@ -873,21 +864,21 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
|
||||
public function test_array_session_diff_first_array_larger() {
|
||||
$a = [];
|
||||
$a['stdClass'] = new stdClass();
|
||||
$a['stdClass'] = new \stdClass();
|
||||
$a['stdClass']->attribute = 'This is an attribute';
|
||||
$a['array'] = ['array', 'contents'];
|
||||
|
||||
$b = [];
|
||||
$b['array'] = ['array', 'contents'];
|
||||
|
||||
$class = new ReflectionClass('\core\session\manager');
|
||||
$class = new \ReflectionClass('\core\session\manager');
|
||||
$method = $class->getMethod('array_session_diff');
|
||||
$method->setAccessible(true);
|
||||
|
||||
$result = $method->invokeArgs(null, [$a, $b]);
|
||||
|
||||
$expected = [];
|
||||
$expected['stdClass'] = new stdClass();
|
||||
$expected['stdClass'] = new \stdClass();
|
||||
$expected['stdClass']->attribute = 'This is an attribute';
|
||||
$this->assertEquals($expected, $result);
|
||||
}
|
||||
@@ -897,11 +888,11 @@ class core_session_manager_testcase extends advanced_testcase {
|
||||
$a['array'] = ['array', 'contents'];
|
||||
|
||||
$b = [];
|
||||
$b['stdClass'] = new stdClass();
|
||||
$b['stdClass'] = new \stdClass();
|
||||
$b['stdClass']->attribute = 'This is an attribute';
|
||||
$b['array'] = ['array', 'contents'];
|
||||
|
||||
$class = new ReflectionClass('\core\session\manager');
|
||||
$class = new \ReflectionClass('\core\session\manager');
|
||||
$method = $class->getMethod('array_session_diff');
|
||||
$method->setAccessible(true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user