* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_event_profile_field_testcase extends advanced_testcase {
+class profile_field_test extends \advanced_testcase {
/**
* Test set up.
@@ -134,7 +129,7 @@ class core_event_profile_field_testcase extends advanced_testcase {
$cat1 = $this->getDataGenerator()->create_custom_profile_field_category(['name' => 'Example category']);
// Create a new profile field.
- $data = new stdClass();
+ $data = new \stdClass();
$data->datatype = 'text';
$data->shortname = 'example';
$data->name = 'Example field';
diff --git a/lib/tests/event_unknown_logged_test.php b/lib/tests/event/unknown_logged_test.php
similarity index 88%
rename from lib/tests/event_unknown_logged_test.php
rename to lib/tests/event/unknown_logged_test.php
index 7d07dce020d..8e40b9b1c1f 100644
--- a/lib/tests/event_unknown_logged_test.php
+++ b/lib/tests/event/unknown_logged_test.php
@@ -14,6 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core\event;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once(__DIR__.'/../fixtures/event_fixtures.php');
+
/**
* Tests for event manager, base event and observers.
*
@@ -22,15 +28,10 @@
* @copyright 2014 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once(__DIR__.'/fixtures/event_fixtures.php');
-
-class core_event_unknown_logged_testcase extends advanced_testcase {
+class unknown_logged_test extends \advanced_testcase {
public function test_restore_event() {
- $event1 = \core_tests\event\unittest_executed::create(array('context' => context_system::instance(), 'other' => array('sample' => 1, 'xx' => 10)));
+ $event1 = \core_tests\event\unittest_executed::create(array('context' => \context_system::instance(), 'other' => array('sample' => 1, 'xx' => 10)));
$data1 = $event1->get_data();
$data1['eventname'] = '\mod_xx\event\xx_yy';
@@ -50,4 +51,4 @@ class core_event_unknown_logged_testcase extends advanced_testcase {
$this->assertEquals($data1, $data2);
$this->assertEquals($extra1, $extra2);
}
-}
\ No newline at end of file
+}
diff --git a/lib/tests/event_user_graded_test.php b/lib/tests/event/user_graded_test.php
similarity index 84%
rename from lib/tests/event_user_graded_test.php
rename to lib/tests/event/user_graded_test.php
index e30e30ab033..283f086c70e 100644
--- a/lib/tests/event_user_graded_test.php
+++ b/lib/tests/event/user_graded_test.php
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Tests the \core\event\user_graded event.
- *
- * @package core
- * @category phpunit
- * @copyright 2014 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core\event;
defined('MOODLE_INTERNAL') || die();
@@ -30,8 +23,6 @@ global $CFG;
require_once($CFG->libdir . '/mathslib.php');
/**
- * Class core_event_user_graded_testcase
- *
* Tests for event \core\event\user_graded
*
* @package core
@@ -39,7 +30,7 @@ require_once($CFG->libdir . '/mathslib.php');
* @copyright 2014 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_event_user_graded_testcase extends advanced_testcase {
+class user_graded_test extends \advanced_testcase {
/**
* Tests set up.
@@ -59,13 +50,13 @@ class core_event_user_graded_testcase extends advanced_testcase {
$user = $this->getDataGenerator()->create_user();
$this->getDataGenerator()->enrol_user($user->id, $course->id);
- $grade_category = grade_category::fetch_course_category($course->id);
+ $grade_category = \grade_category::fetch_course_category($course->id);
$grade_category->load_grade_item();
$grade_item = $grade_category->grade_item;
$grade_item->update_final_grade($user->id, 10, 'gradebook');
- $grade_grade = new grade_grade(array('userid' => $user->id, 'itemid' => $grade_item->id), true);
+ $grade_grade = new \grade_grade(array('userid' => $user->id, 'itemid' => $grade_item->id), true);
$grade_grade->grade_item = $grade_item;
$event = \core\event\user_graded::create_from_grade($grade_grade);
@@ -74,7 +65,7 @@ class core_event_user_graded_testcase extends advanced_testcase {
array($course->id, 'grade', 'update', '/report/grader/index.php?id=' . $course->id, $grade_item->itemname . ': ' . fullname($user)),
$event
);
- $this->assertEquals(context_course::instance($course->id), $event->get_context());
+ $this->assertEquals(\context_course::instance($course->id), $event->get_context());
$this->assertSame($event->objecttable, 'grade_grades');
$this->assertEquals($event->objectid, $grade_grade->id);
$this->assertEquals($event->other['itemid'], $grade_item->id);
@@ -110,8 +101,8 @@ class core_event_user_graded_testcase extends advanced_testcase {
$quiz = $this->getDataGenerator()->create_module('quiz', array('course' => $course->id));
$quizitemparams = array('itemtype' => 'mod', 'itemmodule' => 'quiz', 'iteminstance' => $quiz->id,
'courseid' => $course->id);
- $gradeitem = grade_item::fetch($quizitemparams);
- $courseitem = grade_item::fetch_course_item($course->id);
+ $gradeitem = \grade_item::fetch($quizitemparams);
+ $courseitem = \grade_item::fetch_course_item($course->id);
// Now mark the quiz using grade_update as this is the function that modules use.
$grade = array();
@@ -134,9 +125,9 @@ class core_event_user_graded_testcase extends advanced_testcase {
// will be set as needing an update when the grades are deleted.
$gradeitem->delete_all_grades();
grade_regrade_final_grades($course->id);
- $gradeitem = grade_item::fetch($quizitemparams);
+ $gradeitem = \grade_item::fetch($quizitemparams);
- // Now, create a grade using grade_item::update_final_grade().
+ // Now, create a grade using \grade_item::update_final_grade().
$sink = $this->redirectEvents();
$gradeitem->update_raw_grade($user->id, 10);
$events = $sink->get_events();
@@ -149,7 +140,7 @@ class core_event_user_graded_testcase extends advanced_testcase {
$this->assertInstanceOf('\core\event\user_graded', $events[1]);
$this->assertEquals($courseitem->id, $events[1]->other['itemid']);
- // Now, update this grade using grade_item::update_raw_grade().
+ // Now, update this grade using \grade_item::update_raw_grade().
$sink = $this->redirectEvents();
$gradeitem->update_raw_grade($user->id, 20);
$events = $sink->get_events();
@@ -166,9 +157,9 @@ class core_event_user_graded_testcase extends advanced_testcase {
// will be set as needing an update when the grades are deleted.
$gradeitem->delete_all_grades();
grade_regrade_final_grades($course->id);
- $gradeitem = grade_item::fetch($quizitemparams);
+ $gradeitem = \grade_item::fetch($quizitemparams);
- // Now, create a grade using grade_item::update_final_grade().
+ // Now, create a grade using \grade_item::update_final_grade().
$sink = $this->redirectEvents();
$gradeitem->update_final_grade($user->id, 30);
$events = $sink->get_events();
@@ -181,7 +172,7 @@ class core_event_user_graded_testcase extends advanced_testcase {
$this->assertInstanceOf('\core\event\user_graded', $events[1]);
$this->assertEquals($courseitem->id, $events[1]->other['itemid']);
- // Now, update this grade using grade_item::update_final_grade().
+ // Now, update this grade using \grade_item::update_final_grade().
$sink = $this->redirectEvents();
$gradeitem->update_final_grade($user->id, 40);
$events = $sink->get_events();
@@ -194,12 +185,12 @@ class core_event_user_graded_testcase extends advanced_testcase {
$this->assertInstanceOf('\core\event\user_graded', $events[1]);
$this->assertEquals($courseitem->id, $events[1]->other['itemid']);
- // Remove the overridden flag from the grade, this was set by grade_item::update_final_grade().
- $gradegrade = grade_grade::fetch(array('itemid' => $gradeitem->id, 'userid' => $user->id));
+ // Remove the overridden flag from the grade, this was set by \grade_item::update_final_grade().
+ $gradegrade = \grade_grade::fetch(array('itemid' => $gradeitem->id, 'userid' => $user->id));
$gradegrade->set_overridden(false, false);
// Let's change the calculation to anything that won't cause an error.
- $calculation = calc_formula::unlocalize("=3");
+ $calculation = \calc_formula::unlocalize("=3");
$gradeitem->set_calculation($calculation);
// Now force the computation of the grade.
@@ -216,10 +207,10 @@ class core_event_user_graded_testcase extends advanced_testcase {
$this->assertEquals($courseitem->id, $events[1]->other['itemid']);
// Now, let's trick the gradebook, we manually update a grade, and flag the grade item as
- // needing a regrading, so we can trigger the event in grade_item::regrade_final_grades().
- $gradeitem = grade_item::fetch($quizitemparams);
+ // needing a regrading, so we can trigger the event in \grade_item::regrade_final_grades().
+ $gradeitem = \grade_item::fetch($quizitemparams);
$gradeitem->set_calculation('');
- $gradegrade = grade_grade::fetch(array('itemid' => $gradeitem->id, 'userid' => $user->id));
+ $gradegrade = \grade_grade::fetch(array('itemid' => $gradeitem->id, 'userid' => $user->id));
$gradegrade->rawgrade = 50;
$gradegrade->update();
diff --git a/lib/tests/event_user_password_updated_test.php b/lib/tests/event/user_password_updated_test.php
similarity index 85%
rename from lib/tests/event_user_password_updated_test.php
rename to lib/tests/event/user_password_updated_test.php
index 96b2c0b298c..73af86c35f6 100644
--- a/lib/tests/event_user_password_updated_test.php
+++ b/lib/tests/event/user_password_updated_test.php
@@ -14,26 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Tests for password changes event.
- *
- * @package core
- * @category phpunit
- * @copyright 2014 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
+namespace core\event;
/**
* Tests for event \core\event\user_password_updated
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2014 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_event_user_password_updated_testcase extends advanced_testcase {
+class user_password_updated_test extends \advanced_testcase {
/**
* Test the event.
*/
@@ -41,9 +32,9 @@ class core_event_user_password_updated_testcase extends advanced_testcase {
$this->resetAfterTest();
$user1 = $this->getDataGenerator()->create_user();
- $context1 = context_user::instance($user1->id);
+ $context1 = \context_user::instance($user1->id);
$user2 = $this->getDataGenerator()->create_user();
- $context2 = context_user::instance($user2->id);
+ $context2 = \context_user::instance($user2->id);
$this->setUser($user1);
diff --git a/lib/tests/exporter_test.php b/lib/tests/exporter_test.php
index 8949c231831..ead475e86fb 100644
--- a/lib/tests/exporter_test.php
+++ b/lib/tests/exporter_test.php
@@ -15,13 +15,15 @@
// along with Moodle. If not, see .
/**
- * Exporter class tests.
+ * Exporter testcase.
*
* @package core
* @copyright 2015 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+namespace core;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -32,7 +34,7 @@ global $CFG;
* @copyright 2015 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_exporter_testcase extends advanced_testcase {
+class exporter_test extends \advanced_testcase {
protected $validrelated = null;
protected $invalidrelated = null;
@@ -40,7 +42,7 @@ class core_exporter_testcase extends advanced_testcase {
protected $invaliddata = null;
public function setUp(): void {
- $s = new stdClass();
+ $s = new \stdClass();
$this->validrelated = array(
'simplestdClass' => $s,
'arrayofstdClass' => array($s, $s),
@@ -104,14 +106,14 @@ class core_exporter_testcase extends advanced_testcase {
$output = $PAGE->get_renderer('core');
// The exception message is a bit misleading, it actually indicates an expected property wasn't found.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->expectExceptionMessage('Unexpected property stringAformat');
$result = $exporter->export($output);
}
public function test_invalid_related() {
- $this->expectException(coding_exception::class);
- $this->expectExceptionMessage('Exporter class is missing required related data: (core_testable_exporter) ' .
+ $this->expectException(\coding_exception::class);
+ $this->expectExceptionMessage('Exporter class is missing required related data: (core\core_testable_exporter) ' .
'simplestdClass => stdClass');
$exporter = new core_testable_exporter($this->validdata, $this->invalidrelated);
}
@@ -127,7 +129,7 @@ class core_exporter_testcase extends advanced_testcase {
$exporter = new core_testable_exporter($this->validdata, $data);
$output = $PAGE->get_renderer('core');
$result = $exporter->export($output);
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertNotFalse(strpos($e->getMessage(), $key));
}
}
@@ -147,14 +149,14 @@ class core_exporter_testcase extends advanced_testcase {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
- $syscontext = context_system::instance();
- $coursecontext = context_course::instance($course->id);
+ $syscontext = \context_system::instance();
+ $coursecontext = \context_course::instance($course->id);
- external_settings::get_instance()->set_filter(true);
+ \external_settings::get_instance()->set_filter(true);
filter_set_global_state('urltolink', TEXTFILTER_OFF);
filter_set_local_state('urltolink', $coursecontext->id, TEXTFILTER_ON);
set_config('formats', FORMAT_MARKDOWN, 'filter_urltolink');
- filter_manager::reset_caches();
+ \filter_manager::reset_caches();
$data = [
'stringA' => '__Watch out:__ https://moodle.org @@PLUGINFILE@@/test.pdf',
@@ -168,7 +170,7 @@ class core_exporter_testcase extends advanced_testcase {
$result = $exporter->export($output);
$youtube = 'https://moodle.org';
- $fileurl = (new moodle_url('/webservice/pluginfile.php/' . $syscontext->id . '/test/area/9/test.pdf'))->out(false);
+ $fileurl = (new \moodle_url('/webservice/pluginfile.php/' . $syscontext->id . '/test/area/9/test.pdf'))->out(false);
$expected = "Watch out: $youtube $fileurl
\n";
$this->assertEquals($expected, $result->stringA);
$this->assertEquals(FORMAT_HTML, $result->stringAformat);
@@ -177,7 +179,7 @@ class core_exporter_testcase extends advanced_testcase {
$exporter = new core_testable_exporter($data, ['context' => $coursecontext] + $this->validrelated);
$result = $exporter->export($output);
$youtube = 'https://moodle.org';
- $fileurl = (new moodle_url('/webservice/pluginfile.php/' . $coursecontext->id . '/test/area/9/test.pdf'))->out(false);
+ $fileurl = (new \moodle_url('/webservice/pluginfile.php/' . $coursecontext->id . '/test/area/9/test.pdf'))->out(false);
$expected = "Watch out: $youtube $fileurl
\n";
$this->assertEquals($expected, $result->stringA);
$this->assertEquals(FORMAT_HTML, $result->stringAformat);
@@ -214,7 +216,7 @@ class core_testable_exporter extends \core\external\exporter {
'astring' => 'string', 'abool' => 'bool', 'aint' => 'int', 'ints' => 'int[]');
}
- protected function get_other_values(renderer_base $output) {
+ protected function get_other_values(\renderer_base $output) {
return array(
'otherstring' => '>Another string',
'otherstrings' => array('String >a', 'String b')
@@ -259,7 +261,7 @@ class core_testable_exporter extends \core\external\exporter {
protected function get_format_parameters_for_stringA() {
return [
// For testing use the passed context if any.
- 'context' => isset($this->related['context']) ? $this->related['context'] : context_system::instance(),
+ 'context' => isset($this->related['context']) ? $this->related['context'] : \context_system::instance(),
'component' => 'test',
'filearea' => 'area',
'itemid' => 9,
@@ -268,14 +270,14 @@ class core_testable_exporter extends \core\external\exporter {
protected function get_format_parameters_for_otherstring() {
return [
- 'context' => context_system::instance(),
+ 'context' => \context_system::instance(),
'options' => ['escape' => false]
];
}
protected function get_format_parameters_for_otherstrings() {
return [
- 'context' => context_system::instance(),
+ 'context' => \context_system::instance(),
];
}
}
diff --git a/lib/tests/filelib_test.php b/lib/tests/filelib_test.php
index 1151485396d..69de3c27faf 100644
--- a/lib/tests/filelib_test.php
+++ b/lib/tests/filelib_test.php
@@ -17,19 +17,33 @@
/**
* Unit tests for /lib/filelib.php.
*
- * @package core_files
- * @category phpunit
+ * @package core
+ * @category test
* @copyright 2009 Jerome Mouneyrac
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+namespace core;
+
+use core_filetypes;
+use curl;
+use repository;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . '/filelib.php');
require_once($CFG->dirroot . '/repository/lib.php');
-class core_filelib_testcase extends advanced_testcase {
+/**
+ * Unit tests for /lib/filelib.php.
+ *
+ * @package core
+ * @category test
+ * @copyright 2009 Jerome Mouneyrac
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class filelib_test extends \advanced_testcase {
public function test_format_postdata_for_curlcall() {
// POST params with just simple types.
@@ -196,12 +210,12 @@ class core_filelib_testcase extends advanced_testcase {
// Test HTTP success.
$testhtml = $this->getExternalTestFileUrl('/test.html');
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get($testhtml);
$this->assertSame('47250a973d1b88d9445f94db4ef2c97a', md5($contents));
$this->assertSame(0, $curl->get_errno());
- $curl = new curl();
+ $curl = new \curl();
$tofile = "$CFG->tempdir/test.html";
@unlink($tofile);
$fp = fopen($tofile, 'w');
@@ -212,7 +226,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame($contents, file_get_contents($tofile));
@unlink($tofile);
- $curl = new curl();
+ $curl = new \curl();
$tofile = "$CFG->tempdir/test.html";
@unlink($tofile);
$result = $curl->download_one($testhtml, array(), array('filepath'=>$tofile));
@@ -222,7 +236,7 @@ class core_filelib_testcase extends advanced_testcase {
@unlink($tofile);
// Test 404 request.
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get($this->getExternalTestFileUrl('/i.do.not.exist'));
$response = $curl->getResponse();
$this->assertSame('404 Not Found', reset($response));
@@ -237,12 +251,12 @@ class core_filelib_testcase extends advanced_testcase {
// Test a request with a basic hostname filter applied.
$testhtml = $this->getExternalTestFileUrl('/test.html');
- $url = new moodle_url($testhtml);
+ $url = new \moodle_url($testhtml);
$host = $url->get_host();
set_config('curlsecurityblockedhosts', $host); // Blocks $host.
// Create curl with the default security enabled. We expect this to be blocked.
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get($testhtml);
$expected = $curl->get_security()->get_blocked_url_string();
$this->assertSame($expected, $contents);
@@ -250,7 +264,7 @@ class core_filelib_testcase extends advanced_testcase {
// Now, create a curl using the 'ignoresecurity' override.
// We expect this request to pass, despite the admin setting having been set earlier.
- $curl = new curl(['ignoresecurity' => true]);
+ $curl = new \curl(['ignoresecurity' => true]);
$contents = $curl->get($testhtml);
$this->assertSame('47250a973d1b88d9445f94db4ef2c97a', md5($contents));
$this->assertSame(0, $curl->get_errno());
@@ -264,7 +278,7 @@ class core_filelib_testcase extends advanced_testcase {
// And make the mock security helper block all URLs. This helper instance doesn't care about config.
$mockhelper->expects($this->any())->method('url_is_blocked')->will($this->returnValue(true));
- $curl = new curl(['securityhelper' => $mockhelper]);
+ $curl = new \curl(['securityhelper' => $mockhelper]);
$contents = $curl->get($testhtml);
$this->assertSame('You shall not pass', $curl->get_security()->get_blocked_url_string());
$this->assertSame($curl->get_security()->get_blocked_url_string(), $contents);
@@ -275,7 +289,7 @@ class core_filelib_testcase extends advanced_testcase {
$testurl = $this->getExternalTestFileUrl('/test_redir.php');
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?redir=2", array(), array('CURLOPT_MAXREDIRS'=>2));
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -284,7 +298,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame('done', $contents);
// All redirects are emulated now. Enabling "emulateredirects" explicitly does not have effect.
- $curl = new curl();
+ $curl = new \curl();
$curl->emulateredirects = true;
$contents = $curl->get("$testurl?redir=2", array(), array('CURLOPT_MAXREDIRS'=>2));
$response = $curl->getResponse();
@@ -294,7 +308,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame('done', $contents);
// All redirects are emulated now. Attempting to disable "emulateredirects" explicitly causes warning.
- $curl = new curl();
+ $curl = new \curl();
$curl->emulateredirects = false;
$contents = $curl->get("$testurl?redir=2", array(), array('CURLOPT_MAXREDIRS' => 2));
$response = $curl->getResponse();
@@ -314,7 +328,7 @@ class core_filelib_testcase extends advanced_testcase {
$responsecode302 = '302 Found';
}
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?redir=3", array(), array('CURLOPT_FOLLOWLOCATION'=>0));
$response = $curl->getResponse();
$this->assertSame($responsecode302, reset($response));
@@ -322,12 +336,12 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame(302, $curl->info['http_code']);
$this->assertSame('', $contents);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?redir=2", array(), array('CURLOPT_MAXREDIRS'=>1));
$this->assertSame(CURLE_TOO_MANY_REDIRECTS, $curl->get_errno());
$this->assertNotEmpty($contents);
- $curl = new curl();
+ $curl = new \curl();
$tofile = "$CFG->tempdir/test.html";
@unlink($tofile);
$fp = fopen($tofile, 'w');
@@ -338,7 +352,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame('done', file_get_contents($tofile));
@unlink($tofile);
- $curl = new curl();
+ $curl = new \curl();
$tofile = "$CFG->tempdir/test.html";
@unlink($tofile);
$fp = fopen($tofile, 'w');
@@ -349,7 +363,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame('done', file_get_contents($tofile));
@unlink($tofile);
- $curl = new curl();
+ $curl = new \curl();
$tofile = "$CFG->tempdir/test.html";
@unlink($tofile);
$result = $curl->download_one("$testurl?redir=1", array(), array('filepath'=>$tofile));
@@ -358,7 +372,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame('done', file_get_contents($tofile));
@unlink($tofile);
- $curl = new curl();
+ $curl = new \curl();
$tofile = "$CFG->tempdir/test.html";
@unlink($tofile);
$result = $curl->download_one("$testurl?redir=1&verbose=1", array(), array('filepath' => $tofile));
@@ -381,21 +395,21 @@ class core_filelib_testcase extends advanced_testcase {
set_config('curlsecurityblockedhosts', 'moodle.com');
// Redirecting to a non-blocked host should resolve.
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("{$testurl}?redir=2");
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
$this->assertSame(0, $curl->get_errno());
// Redirecting to the blocked host should fail.
- $curl = new curl();
+ $curl = new \curl();
$blockedstring = $curl->get_security()->get_blocked_url_string();
$contents = $curl->get("{$testurl}?redir=1&extdest=1");
$this->assertSame($blockedstring, $contents);
$this->assertSame(0, $curl->get_errno());
// Redirecting to the blocked host after multiple successful redirects should also fail.
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("{$testurl}?redir=3&extdest=1");
$this->assertSame($blockedstring, $contents);
$this->assertSame(0, $curl->get_errno());
@@ -405,7 +419,7 @@ class core_filelib_testcase extends advanced_testcase {
// Test relative location redirects.
$testurl = $this->getExternalTestFileUrl('/test_relative_redir.php');
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get($testurl);
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -416,7 +430,7 @@ class core_filelib_testcase extends advanced_testcase {
// Test different redirect types.
$testurl = $this->getExternalTestFileUrl('/test_relative_redir.php');
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?type=301");
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -424,7 +438,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame(1, $curl->info['redirect_count']);
$this->assertSame('done', $contents);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?type=302");
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -432,7 +446,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame(1, $curl->info['redirect_count']);
$this->assertSame('done', $contents);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?type=303");
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -440,7 +454,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame(1, $curl->info['redirect_count']);
$this->assertSame('done', $contents);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?type=307");
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -448,7 +462,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame(1, $curl->info['redirect_count']);
$this->assertSame('done', $contents);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get("$testurl?type=308");
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -467,7 +481,7 @@ class core_filelib_testcase extends advanced_testcase {
// Test without proxy bypass and inaccessible proxy.
$CFG->proxyhost = 'i.do.not.exist';
$CFG->proxybypass = '';
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get($testurl);
$this->assertNotEquals(0, $curl->get_errno());
$this->assertNotEquals('47250a973d1b88d9445f94db4ef2c97a', md5($contents));
@@ -475,7 +489,7 @@ class core_filelib_testcase extends advanced_testcase {
// Test with proxy bypass.
$testurlhost = parse_url($testurl, PHP_URL_HOST);
$CFG->proxybypass = $testurlhost;
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->get($testurl);
$this->assertSame(0, $curl->get_errno());
$this->assertSame('47250a973d1b88d9445f94db4ef2c97a', md5($contents));
@@ -490,7 +504,7 @@ class core_filelib_testcase extends advanced_testcase {
public function test_duplicate_curl_header() {
$testurl = $this->getExternalTestFileUrl('/test_post.php');
- $curl = new curl();
+ $curl = new \curl();
$headerdata = 'Accept: application/json';
$header = [$headerdata, $headerdata];
$this->assertCount(2, $header);
@@ -503,7 +517,7 @@ class core_filelib_testcase extends advanced_testcase {
$testurl = $this->getExternalTestFileUrl('/test_post.php');
// Test post request.
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->post($testurl, 'data=moodletest');
$response = $curl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -511,7 +525,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertSame('OK', $contents);
// Test 100 requests.
- $curl = new curl();
+ $curl = new \curl();
$curl->setHeader('Expect: 100-continue');
$contents = $curl->post($testurl, 'data=moodletest');
$response = $curl->getResponse();
@@ -526,7 +540,7 @@ class core_filelib_testcase extends advanced_testcase {
$fs = get_file_storage();
$filerecord = array(
- 'contextid' => context_system::instance()->id,
+ 'contextid' => \context_system::instance()->id,
'component' => 'test',
'filearea' => 'curl_post',
'itemid' => 0,
@@ -538,7 +552,7 @@ class core_filelib_testcase extends advanced_testcase {
// Test post with file.
$data = array('testfile' => $testfile);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->post($testurl, $data);
$this->assertSame('OK', $contents);
}
@@ -549,7 +563,7 @@ class core_filelib_testcase extends advanced_testcase {
$fs = get_file_storage();
$filerecord = array(
- 'contextid' => context_system::instance()->id,
+ 'contextid' => \context_system::instance()->id,
'component' => 'test',
'filearea' => 'curl_post',
'itemid' => 0,
@@ -561,7 +575,7 @@ class core_filelib_testcase extends advanced_testcase {
// Test post with file.
$data = array('testfile' => $testfile);
- $curl = new curl();
+ $curl = new \curl();
$contents = $curl->post($testurl, $data);
$this->assertSame('OK', $contents);
}
@@ -570,7 +584,7 @@ class core_filelib_testcase extends advanced_testcase {
// HTTP and HTTPS requests were verified in previous requests. Now check
// that we can selectively disable some protocols.
- $curl = new curl();
+ $curl = new \curl();
// Other protocols than HTTP(S) are disabled by default.
$testurl = 'file:///';
@@ -618,7 +632,7 @@ class core_filelib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$user = $generator->create_user();
- $usercontext = context_user::instance($user->id);
+ $usercontext = \context_user::instance($user->id);
$USER = $DB->get_record('user', array('id'=>$user->id));
$repositorypluginname = 'user';
@@ -631,7 +645,7 @@ class core_filelib_testcase extends advanced_testcase {
$fs = get_file_storage();
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$component = 'core';
$filearea = 'unittest';
$itemid = 0;
@@ -654,7 +668,7 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertInstanceOf('stored_file', $originalfile);
// Create a user private file.
- $userfilerecord = new stdClass;
+ $userfilerecord = new \stdClass;
$userfilerecord->contextid = $usercontext->id;
$userfilerecord->component = 'user';
$userfilerecord->filearea = 'private';
@@ -729,7 +743,7 @@ class core_filelib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$user = $generator->create_user();
- $usercontext = context_user::instance($user->id);
+ $usercontext = \context_user::instance($user->id);
$USER = $DB->get_record('user', array('id'=>$user->id));
$repositorypluginname = 'user';
@@ -741,12 +755,12 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertInstanceOf('repository', $userrepository);
$fs = get_file_storage();
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$filecontent = 'User file content';
// Create a user private file.
- $userfilerecord = new stdClass;
+ $userfilerecord = new \stdClass;
$userfilerecord->contextid = $usercontext->id;
$userfilerecord->component = 'user';
$userfilerecord->filearea = 'private';
@@ -800,7 +814,7 @@ class core_filelib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$user = $generator->create_user();
- $usercontext = context_user::instance($user->id);
+ $usercontext = \context_user::instance($user->id);
$USER = $DB->get_record('user', array('id' => $user->id));
$repositorypluginname = 'user';
@@ -812,12 +826,12 @@ class core_filelib_testcase extends advanced_testcase {
$this->assertInstanceOf('repository', $userrepository);
$fs = get_file_storage();
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$filecontent = 'User file content';
// Create a user private file.
- $userfilerecord = new stdClass;
+ $userfilerecord = new \stdClass;
$userfilerecord->contextid = $usercontext->id;
$userfilerecord->component = 'user';
$userfilerecord->filearea = 'private';
@@ -913,9 +927,9 @@ EOF;
$mdl30648expected = preg_replace("~(?!<\r)\n~", "\r\n", $mdl30648expected);
// Test stripping works OK.
- $this->assertSame($mdl30648expected, curl::strip_double_headers($mdl30648example));
+ $this->assertSame($mdl30648expected, \curl::strip_double_headers($mdl30648example));
// Test it does nothing to the 'plain' data.
- $this->assertSame($mdl30648expected, curl::strip_double_headers($mdl30648expected));
+ $this->assertSame($mdl30648expected, \curl::strip_double_headers($mdl30648expected));
// Example from OU proxy.
$httpsexample = <<assertSame($httpsexpected, curl::strip_double_headers($httpsexample));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexample));
// Test it does nothing to the 'plain' data.
- $this->assertSame($httpsexpected, curl::strip_double_headers($httpsexpected));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexpected));
$httpsexample = <<assertSame($httpsexpected, curl::strip_double_headers($httpsexample));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexample));
// Test it does nothing to the 'plain' data.
- $this->assertSame($httpsexpected, curl::strip_double_headers($httpsexpected));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexpected));
$httpsexample = <<assertSame($httpsexpected, curl::strip_double_headers($httpsexample));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexample));
// Test it does nothing to the 'plain' data.
- $this->assertSame($httpsexpected, curl::strip_double_headers($httpsexpected));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexpected));
$httpsexample = <<assertSame($httpsexpected, curl::strip_double_headers($httpsexample));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexample));
// Test it does nothing to the 'plain' data.
- $this->assertSame($httpsexpected, curl::strip_double_headers($httpsexpected));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexpected));
$httpsexample = <<assertSame($httpsexpected, curl::strip_double_headers($httpsexample));
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexample));
// Test it does nothing to the 'plain' data.
- $this->assertSame($httpsexpected, curl::strip_double_headers($httpsexpected));
-
+ $this->assertSame($httpsexpected, \curl::strip_double_headers($httpsexpected));
}
/**
@@ -1131,7 +1144,7 @@ EOF;
get_mimetype_description(array('filename' => 'test.frog')));
// Test custom description using multilang filter.
- filter_manager::reset_caches();
+ \filter_manager::reset_caches();
filter_set_global_state('multilang', TEXTFILTER_ON);
filter_set_applies_to_strings('multilang', true);
core_filetypes::update_type('frog', 'frog', 'application/x-frog', 'document',
@@ -1221,7 +1234,7 @@ EOF;
// Finally, test it via exttests, to ensure the agent is sent properly.
// Matching.
$testurl = $this->getExternalTestFileUrl('/test_agent.php');
- $extcurl = new curl();
+ $extcurl = new \curl();
$contents = $extcurl->get($testurl, array(), array('CURLOPT_USERAGENT' => 'AnotherUserAgent/1.2'));
$response = $extcurl->getResponse();
$this->assertSame('200 OK', reset($response));
@@ -1240,7 +1253,7 @@ EOF;
*/
public function test_file_rewrite_pluginfile_urls() {
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$originaltext = 'Fake test with an image 
';
// Do the rewrite.
@@ -1265,7 +1278,7 @@ EOF;
$this->resetAfterTest();
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$originaltext = 'Fake test with an image ';
$options = ['includetoken' => true];
@@ -1314,7 +1327,7 @@ EOF;
$this->resetAfterTest();
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$originaltext = 'Fake test with an image ';
$options = ['includetoken' => true];
@@ -1364,7 +1377,7 @@ EOF;
if (isset($filedata['contextid'])) {
$filerecord['contextid'] = $filedata['contextid'];
} else {
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
$filerecord['contextid'] = $usercontext->id;
}
$source = isset($filedata['source']) ? $filedata['source'] : serialize((object)array('source' => 'From string'));
@@ -1385,7 +1398,7 @@ EOF;
$this->resetAfterTest(true);
$this->setAdminUser();
$fs = get_file_storage();
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
// Create a draft file.
$filename = 'data.txt';
@@ -1499,7 +1512,7 @@ EOF;
// Add new file.
file_merge_files_from_draft_area_into_filearea($file->get_itemid(), $file->get_contextid(), 'user', 'private', 0, $options);
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
$files = $fs->get_area_files($usercontext->id, 'user', 'private', 0);
$this->assertCount(0, $files);
}
@@ -1524,7 +1537,7 @@ EOF;
// Add new file.
file_merge_files_from_draft_area_into_filearea($file->get_itemid(), $file->get_contextid(), 'user', 'private', 0, $options);
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
// Check we only get the base directory, not a new file.
$files = $fs->get_area_files($usercontext->id, 'user', 'private', 0);
$this->assertCount(1, $files);
@@ -1550,7 +1563,7 @@ EOF;
// Add new file.
file_merge_files_from_draft_area_into_filearea($file->get_itemid(), $file->get_contextid(), 'user', 'private', 0, $options);
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
// Check we only get the base directory, not a new file.
$files = $fs->get_area_files($usercontext->id, 'user', 'private', 0);
$this->assertCount(1, $files);
@@ -1583,7 +1596,7 @@ EOF;
$size += $file->get_filesize();
// Create directory.
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
$dir = $fs->create_directory($usercontext->id, 'user', 'draft', $draftitemid, '/testsubdir/');
// Add file to directory.
$filerecord = array(
@@ -1640,7 +1653,7 @@ EOF;
$size += $file->get_filesize();
// Create directory.
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
$dir = $fs->create_directory($usercontext->id, 'user', 'draft', $draftitemid, '/testsubdir/');
// Add file to directory.
$filerecord = array(
@@ -1692,7 +1705,7 @@ EOF;
// Confirm the user drafts area lists 3 files.
$fs = get_file_storage();
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
$draftfiles = $fs->get_area_files($usercontext->id, 'user', 'draft', $draftitemid, 'itemid', 0);
$this->assertCount(3, $draftfiles);
@@ -1776,7 +1789,7 @@ EOF;
// Confirm one file in each draft area.
$fs = get_file_storage();
- $usercontext = context_user::instance($USER->id);
+ $usercontext = \context_user::instance($USER->id);
$draftfiles = $fs->get_area_files($usercontext->id, 'user', 'draft', $file1->get_itemid(), 'itemid', 0);
$this->assertCount(1, $draftfiles);
$draftfiles = $fs->get_area_files($usercontext->id, 'user', 'draft', $file2->get_itemid(), 'itemid', 0);
@@ -1874,7 +1887,7 @@ class testable_curl extends curl {
*/
public function get_options() {
// Access to private property.
- $rp = new ReflectionProperty('curl', 'options');
+ $rp = new \ReflectionProperty('curl', 'options');
$rp->setAccessible(true);
return $rp->getValue($this);
}
@@ -1886,7 +1899,7 @@ class testable_curl extends curl {
*/
public function set_options($options) {
// Access to private property.
- $rp = new ReflectionProperty('curl', 'options');
+ $rp = new \ReflectionProperty('curl', 'options');
$rp->setAccessible(true);
$rp->setValue($this, $options);
}
@@ -1913,14 +1926,14 @@ class testable_curl extends curl {
}
/**
- * Wrapper to access the private curl::apply_opt() method using reflection.
+ * Wrapper to access the private \curl::apply_opt() method using reflection.
*
* @param array $options
* @return resource The curl handle
*/
public function call_apply_opt($options = null) {
// Access to private method.
- $rm = new ReflectionMethod('curl', 'apply_opt');
+ $rm = new \ReflectionMethod('curl', 'apply_opt');
$rm->setAccessible(true);
$ch = curl_init();
return $rm->invoke($this, $ch, $options);
diff --git a/lib/tests/filestorage_zip_archive_test.php b/lib/tests/filestorage_zip_archive_test.php
index 339919f5501..06eb9db2fed 100644
--- a/lib/tests/filestorage_zip_archive_test.php
+++ b/lib/tests/filestorage_zip_archive_test.php
@@ -14,13 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for /lib/filestorage/zip_archive.php.
- *
- * @package core_files
- * @copyright 2020 Université Rennes 2 {@link https://www.univ-rennes2.fr}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use zip_archive;
defined('MOODLE_INTERNAL') || die();
@@ -31,11 +27,11 @@ require_once($CFG->libdir . '/filestorage/zip_archive.php');
/**
* Unit tests for /lib/filestorage/zip_archive.php.
*
- * @package core_files
+ * @package core
* @copyright 2020 Université Rennes 2 {@link https://www.univ-rennes2.fr}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class filestorage_zip_archive_testcase extends advanced_testcase {
+class filestorage_zip_archive_test extends \advanced_testcase {
/**
* Test mangle_pathname() method.
*
@@ -47,7 +43,7 @@ class filestorage_zip_archive_testcase extends advanced_testcase {
public function test_mangle_pathname($string, $expected) {
$ziparchive = new zip_archive();
- $method = new ReflectionMethod('zip_archive', 'mangle_pathname');
+ $method = new \ReflectionMethod('zip_archive', 'mangle_pathname');
$method->setAccessible(true);
$result = $method->invoke($ziparchive, $string);
diff --git a/lib/tests/filetypes_test.php b/lib/tests/filetypes_test.php
index 7c2753eb1cb..478de231f16 100644
--- a/lib/tests/filetypes_test.php
+++ b/lib/tests/filetypes_test.php
@@ -14,13 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for /lib/classes/filetypes.php.
- *
- * @package core
- * @copyright 2014 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use core_filetypes;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +30,7 @@ require_once($CFG->libdir . '/filelib.php');
* @copyright 2014 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_filetypes_testcase extends advanced_testcase {
+class filetypes_test extends \advanced_testcase {
public function test_add_type() {
$this->resetAfterTest();
@@ -63,7 +59,7 @@ class core_filetypes_testcase extends advanced_testcase {
try {
core_filetypes::add_type('frog', 'application/x-frog', 'document');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('already exists', $e->getMessage());
$this->assertStringContainsString('frog', $e->getMessage());
}
@@ -72,14 +68,14 @@ class core_filetypes_testcase extends advanced_testcase {
try {
core_filetypes::add_type('.frog', 'application/x-frog', 'document');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('Invalid extension', $e->getMessage());
$this->assertStringContainsString('..frog', $e->getMessage());
}
try {
core_filetypes::add_type('', 'application/x-frog', 'document');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('Invalid extension', $e->getMessage());
}
@@ -89,7 +85,7 @@ class core_filetypes_testcase extends advanced_testcase {
core_filetypes::add_type('gecko', 'text/plain', 'document',
array(), '', '', true);
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('default icon set', $e->getMessage());
$this->assertStringContainsString('text/plain', $e->getMessage());
}
@@ -121,7 +117,7 @@ class core_filetypes_testcase extends advanced_testcase {
try {
core_filetypes::update_type('doc', 'doc', 'application/x-frog', 'document');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('not found', $e->getMessage());
$this->assertStringContainsString('doc', $e->getMessage());
}
@@ -130,14 +126,14 @@ class core_filetypes_testcase extends advanced_testcase {
try {
core_filetypes::update_type('docccc', '.frog', 'application/x-frog', 'document');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('Invalid extension', $e->getMessage());
$this->assertStringContainsString('.frog', $e->getMessage());
}
try {
core_filetypes::update_type('docccc', '', 'application/x-frog', 'document');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('Invalid extension', $e->getMessage());
}
@@ -146,7 +142,7 @@ class core_filetypes_testcase extends advanced_testcase {
core_filetypes::update_type('docccc', 'docccc', 'text/plain', 'document',
array(), '', '', true);
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('default icon set', $e->getMessage());
$this->assertStringContainsString('text/plain', $e->getMessage());
}
@@ -168,7 +164,7 @@ class core_filetypes_testcase extends advanced_testcase {
try {
core_filetypes::delete_type('doc');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('not found', $e->getMessage());
$this->assertStringContainsString('doc', $e->getMessage());
}
@@ -203,7 +199,7 @@ class core_filetypes_testcase extends advanced_testcase {
try {
core_filetypes::revert_type_to_default('frog');
$this->fail();
- } catch (coding_exception $e) {
+ } catch (\coding_exception $e) {
$this->assertStringContainsString('not a default type', $e->getMessage());
$this->assertStringContainsString('frog', $e->getMessage());
}
diff --git a/lib/tests/filter_manager_test.php b/lib/tests/filter_manager_test.php
index 200fe139f13..14517b4d8b2 100644
--- a/lib/tests/filter_manager_test.php
+++ b/lib/tests/filter_manager_test.php
@@ -14,6 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
+use filter_manager;
+
/**
* Unit tests for the {@link filter_manager} class.
*
@@ -22,17 +26,7 @@
* @copyright 2015 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-
-/**
- * Unit tests for the {@link filter_manager} class.
- *
- * @copyright 2015 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
-class core_filter_manager_testcase extends advanced_testcase {
+class filter_manager_test extends \advanced_testcase {
/**
* Helper method to apply filters to some text and return the result.
diff --git a/lib/tests/filterlib_test.php b/lib/tests/filterlib_test.php
index 21df7ed847a..29bd34c74ef 100644
--- a/lib/tests/filterlib_test.php
+++ b/lib/tests/filterlib_test.php
@@ -14,15 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Tests for the parts of ../filterlib.php that involve loading the configuration
- * from, and saving the configuration to, the database.
- *
- * @package core_filter
- * @category phpunit
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use filter_manager;
defined('MOODLE_INTERNAL') || die();
@@ -31,8 +25,16 @@ require_once($CFG->libdir . '/filterlib.php');
/**
* Test filters.
+ *
+ * Tests for the parts of ../filterlib.php that involve loading the configuration
+ * from, and saving the configuration to, the database.
+ *
+ * @package core
+ * @category test
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_filterlib_testcase extends advanced_testcase {
+class filterlib_test extends \advanced_testcase {
private function assert_only_one_filter_globally($filter, $state) {
global $DB;
@@ -40,9 +42,9 @@ class core_filterlib_testcase extends advanced_testcase {
$this->assertCount(1, $recs);
$rec = reset($recs);
unset($rec->id);
- $expectedrec = new stdClass();
+ $expectedrec = new \stdClass();
$expectedrec->filter = $filter;
- $expectedrec->contextid = context_system::instance()->id;
+ $expectedrec->contextid = \context_system::instance()->id;
$expectedrec->active = $state;
$expectedrec->sortorder = 1;
$this->assertEquals($expectedrec, $rec);
@@ -52,7 +54,7 @@ class core_filterlib_testcase extends advanced_testcase {
global $DB;
$sortedfilters = $DB->get_records_menu('filter_active',
- array('contextid' => context_system::instance()->id), 'sortorder', 'sortorder,filter');
+ array('contextid' => \context_system::instance()->id), 'sortorder', 'sortorder,filter');
$testarray = array();
$index = 1;
foreach ($filters as $filter) {
@@ -93,7 +95,7 @@ class core_filterlib_testcase extends advanced_testcase {
public function test_global_config_exception_on_invalid_state() {
$this->resetAfterTest();
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
filter_set_global_state('name', 0);
}
@@ -227,7 +229,7 @@ class core_filterlib_testcase extends advanced_testcase {
$rec = reset($recs);
unset($rec->id);
unset($rec->sortorder);
- $expectedrec = new stdClass();
+ $expectedrec = new \stdClass();
$expectedrec->filter = $filter;
$expectedrec->contextid = $contextid;
$expectedrec->active = $state;
@@ -269,15 +271,15 @@ class core_filterlib_testcase extends advanced_testcase {
public function test_local_invalid_state_throws_exception() {
$this->resetAfterTest();
// Exercise SUT.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
filter_set_local_state('name', 123, -9999);
}
public function test_throws_exception_when_setting_global() {
$this->resetAfterTest();
// Exercise SUT.
- $this->expectException(coding_exception::class);
- filter_set_local_state('name', context_system::instance()->id, TEXTFILTER_INHERIT);
+ $this->expectException(\coding_exception::class);
+ filter_set_local_state('name', \context_system::instance()->id, TEXTFILTER_INHERIT);
}
public function test_local_inherit_deletes_existing() {
@@ -297,7 +299,7 @@ class core_filterlib_testcase extends advanced_testcase {
$this->assertEquals(1, count($recs), 'More than one record returned %s.');
$rec = reset($recs);
unset($rec->id);
- $expectedrec = new stdClass();
+ $expectedrec = new \stdClass();
$expectedrec->filter = $filter;
$expectedrec->contextid = $context;
$expectedrec->name = $name;
@@ -341,9 +343,9 @@ class core_filterlib_testcase extends advanced_testcase {
protected function setup_available_in_context_tests() {
$course = $this->getDataGenerator()->create_course(array('category' => 1));
- $childcontext = context_coursecat::instance(1);
- $childcontext2 = context_course::instance($course->id);
- $syscontext = context_system::instance();
+ $childcontext = \context_coursecat::instance(1);
+ $childcontext2 = \context_course::instance($course->id);
+ $syscontext = \context_system::instance();
return [
'syscontext' => $syscontext,
@@ -504,7 +506,7 @@ class core_filterlib_testcase extends advanced_testcase {
$this->assertEquals(1, count($filters), 'More than one record returned %s.');
$rec = $filters[$filter];
unset($rec->id);
- $expectedrec = new stdClass();
+ $expectedrec = new \stdClass();
$expectedrec->filter = $filter;
$expectedrec->localstate = $localstate;
$expectedrec->inheritedstate = $inheritedstate;
@@ -563,19 +565,19 @@ class core_filterlib_testcase extends advanced_testcase {
'syscontext' => $syscontext
] = $this->setup_available_in_context_tests();
// Exercise SUT.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
filter_get_available_in_context($syscontext);
}
protected function setup_preload_activities_test() {
- $syscontext = context_system::instance();
- $catcontext = context_coursecat::instance(1);
+ $syscontext = \context_system::instance();
+ $catcontext = \context_coursecat::instance(1);
$course = $this->getDataGenerator()->create_course(array('category' => 1));
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$page1 = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
- $activity1context = context_module::instance($page1->cmid);
+ $activity1context = \context_module::instance($page1->cmid);
$page2 = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
- $activity2context = context_module::instance($page2->cmid);
+ $activity2context = \context_module::instance($page2->cmid);
return [
'syscontext' => $syscontext,
'catcontext' => $catcontext,
@@ -590,7 +592,7 @@ class core_filterlib_testcase extends advanced_testcase {
global $FILTERLIB_PRIVATE, $DB;
// Use preload cache...
- $FILTERLIB_PRIVATE = new stdClass();
+ $FILTERLIB_PRIVATE = new \stdClass();
filter_preload_activities($modinfo);
// Get data and check no queries are made.
@@ -601,7 +603,7 @@ class core_filterlib_testcase extends advanced_testcase {
$this->assertEquals($before, $after);
// Repeat without cache and check it makes queries now.
- $FILTERLIB_PRIVATE = new stdClass;
+ $FILTERLIB_PRIVATE = new \stdClass;
$before = $DB->perf_get_reads();
$filters1 = filter_get_active_in_context($activity1context);
$filters2 = filter_get_active_in_context($activity2context);
@@ -623,7 +625,7 @@ class core_filterlib_testcase extends advanced_testcase {
'activity2context' => $activity2context
] = $this->setup_preload_activities_test();
// Get course and modinfo.
- $modinfo = new course_modinfo($course, 2);
+ $modinfo = new \course_modinfo($course, 2);
// Note: All the tests in this function check that the result from the
// preloaded cache is the same as the result from calling the standard
@@ -681,8 +683,8 @@ class core_filterlib_testcase extends advanced_testcase {
// Setup fixture.
filter_set_global_state('name', TEXTFILTER_ON);
filter_set_global_state('other', TEXTFILTER_ON);
- filter_set_local_config('name', context_system::instance()->id, 'settingname', 'A value');
- filter_set_local_config('other', context_system::instance()->id, 'settingname', 'Other value');
+ filter_set_local_config('name', \context_system::instance()->id, 'settingname', 'A value');
+ filter_set_local_config('other', \context_system::instance()->id, 'settingname', 'Other value');
set_config('configname', 'A config value', 'filter_name');
set_config('configname', 'Other config value', 'filter_other');
// Exercise SUT.
@@ -692,10 +694,10 @@ class core_filterlib_testcase extends advanced_testcase {
$this->assertTrue($DB->record_exists('filter_active', array('filter' => 'other')));
$this->assertEquals(1, $DB->count_records('filter_config'));
$this->assertTrue($DB->record_exists('filter_config', array('filter' => 'other')));
- $expectedconfig = new stdClass;
+ $expectedconfig = new \stdClass;
$expectedconfig->configname = 'Other config value';
$this->assertEquals($expectedconfig, get_config('filter_other'));
- $this->assertEquals(get_config('filter_name'), new stdClass());
+ $this->assertEquals(get_config('filter_name'), new \stdClass());
}
public function test_filter_delete_all_for_context() {
@@ -713,7 +715,7 @@ class core_filterlib_testcase extends advanced_testcase {
filter_delete_all_for_context(123);
// Validate.
$this->assertEquals(1, $DB->count_records('filter_active'));
- $this->assertTrue($DB->record_exists('filter_active', array('contextid' => context_system::instance()->id)));
+ $this->assertTrue($DB->record_exists('filter_active', array('contextid' => \context_system::instance()->id)));
$this->assertEquals(1, $DB->count_records('filter_config'));
$this->assertTrue($DB->record_exists('filter_config', array('filter' => 'other')));
}
@@ -802,7 +804,7 @@ class core_filterlib_testcase extends advanced_testcase {
$active = filter_get_active_state('glossary');
$this->assertEquals($active, TEXTFILTER_ON);
- $systemcontext = context_system::instance();
+ $systemcontext = \context_system::instance();
// Passing $systemcontext object.
$active = filter_get_active_state('glossary', $systemcontext);
$this->assertEquals($active, TEXTFILTER_ON);
@@ -834,17 +836,17 @@ class core_filterlib_testcase extends advanced_testcase {
$this->resetAfterTest();
filter_set_global_state('glossary', TEXTFILTER_ON);
- $systemcontextid = context_system::instance()->id;
+ $systemcontextid = \context_system::instance()->id;
$active = filter_get_active_state('glossary', $systemcontextid);
$this->assertEquals($active, TEXTFILTER_ON);
filter_set_global_state('glossary', TEXTFILTER_OFF);
- $systemcontextid = context_system::instance()->id;
+ $systemcontextid = \context_system::instance()->id;
$active = filter_get_active_state('glossary', $systemcontextid);
$this->assertEquals($active, TEXTFILTER_OFF);
filter_set_global_state('glossary', TEXTFILTER_DISABLED);
- $systemcontextid = context_system::instance()->id;
+ $systemcontextid = \context_system::instance()->id;
$active = filter_get_active_state('glossary', $systemcontextid);
$this->assertEquals($active, TEXTFILTER_DISABLED);
}
diff --git a/lib/tests/formslib_test.php b/lib/tests/formslib_test.php
index 50024b2a57c..08c3d42eb9c 100644
--- a/lib/tests/formslib_test.php
+++ b/lib/tests/formslib_test.php
@@ -17,12 +17,21 @@
/**
* Unit tests for /lib/formslib.php.
*
- * @package core_form
- * @category phpunit
+ * @package core
+ * @category test
* @copyright 2011 Sam Hemelryk
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+namespace core;
+
+use HTML_QuickForm_Rule_Range;
+use moodleform;
+use MoodleQuickForm_radio;
+use MoodleQuickForm_Rule_Required;
+use MoodleQuickForm_select;
+use MoodleQuickForm_text;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -31,8 +40,15 @@ require_once($CFG->libdir . '/form/radio.php');
require_once($CFG->libdir . '/form/select.php');
require_once($CFG->libdir . '/form/text.php');
-
-class core_formslib_testcase extends advanced_testcase {
+/**
+ * Unit tests for /lib/formslib.php.
+ *
+ * @package core
+ * @category test
+ * @copyright 2011 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class formslib_test extends \advanced_testcase {
public function test_require_rule() {
global $CFG;
diff --git a/lib/tests/gdlib_test.php b/lib/tests/gdlib_test.php
index edc6d1df77b..d322d33d5cf 100644
--- a/lib/tests/gdlib_test.php
+++ b/lib/tests/gdlib_test.php
@@ -14,27 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Test gd functionality.
- *
- * @package core
- * @category phpunit
- * @copyright 2015 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
+namespace core;
/**
* A set of tests for some of the gd functionality within Moodle.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2015 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_gdlib_testcase extends basic_testcase {
+class gdlib_test extends \basic_testcase {
private $fixturepath = null;
diff --git a/lib/tests/googlelib_test.php b/lib/tests/googlelib_test.php
index 4489fcf64cc..59241e76cd9 100644
--- a/lib/tests/googlelib_test.php
+++ b/lib/tests/googlelib_test.php
@@ -14,6 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
+use Google_Service_Exception;
+use Google_Service_YouTube;
+
/**
* Tests for google library
*
@@ -21,7 +26,7 @@
* @copyright 2021 Marina Glancy
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_googlelib_testcase extends advanced_testcase {
+class googlelib_test extends \advanced_testcase {
public function test_invalid_google_api_key() {
global $CFG;
diff --git a/lib/tests/gradelib_test.php b/lib/tests/gradelib_test.php
index 37cd372dabb..9c4d1d8ce66 100644
--- a/lib/tests/gradelib_test.php
+++ b/lib/tests/gradelib_test.php
@@ -14,28 +14,29 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for /lib/gradelib.php.
- *
- * @package core_grades
- * @category phpunit
- * @copyright 2012 Andrew Davis
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . '/gradelib.php');
-class core_gradelib_testcase extends advanced_testcase {
+/**
+ * Unit tests for /lib/gradelib.php.
+ *
+ * @package core
+ * @category test
+ * @copyright 2012 Andrew Davis
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class gradelib_test extends \advanced_testcase {
public function test_grade_update_mod_grades() {
$this->resetAfterTest(true);
// Create a broken module instance.
- $modinstance = new stdClass();
+ $modinstance = new \stdClass();
$modinstance->modname = 'doesntexist';
$this->assertFalse(grade_update_mod_grades($modinstance));
@@ -67,17 +68,17 @@ class core_gradelib_testcase extends advanced_testcase {
$course = $this->getDataGenerator()->create_course();
- $context = context_course::instance($course->id);
+ $context = \context_course::instance($course->id);
// Add a grade letter to the course.
- $letter = new stdClass();
+ $letter = new \stdClass();
$letter->letter = 'M';
$letter->lowerboundary = '100';
$letter->contextid = $context->id;
$DB->insert_record('grade_letters', $letter);
// Pre-warm the cache, ensure that that the letter is cached.
- $cache = cache::make('core', 'grade_letters');
+ $cache = \cache::make('core', 'grade_letters');
// Check that the cache is empty beforehand.
$letters = $cache->get($context->id);
@@ -108,13 +109,13 @@ class core_gradelib_testcase extends advanced_testcase {
$this->resetAfterTest();
- $category = core_course_category::create(array('name' => 'Cat1'));
+ $category = \core_course_category::create(array('name' => 'Cat1'));
// Add a grade letter to the category.
- $letter = new stdClass();
+ $letter = new \stdClass();
$letter->letter = 'M';
$letter->lowerboundary = '100';
- $letter->contextid = context_coursecat::instance($category->id)->id;
+ $letter->contextid = \context_coursecat::instance($category->id)->id;
$DB->insert_record('grade_letters', $letter);
grade_course_category_delete($category->id, '', false);
@@ -138,11 +139,11 @@ class core_gradelib_testcase extends advanced_testcase {
// We need two grade items.
$params = ['idnumber' => 'g1', 'courseid' => $course->id];
- $g1 = new grade_item($this->getDataGenerator()->create_grade_item($params));
+ $g1 = new \grade_item($this->getDataGenerator()->create_grade_item($params));
unset($params['idnumber']);
- $g2 = new grade_item($this->getDataGenerator()->create_grade_item($params));
+ $g2 = new \grade_item($this->getDataGenerator()->create_grade_item($params));
- $category = new grade_category($this->getDataGenerator()->create_grade_category($params));
+ $category = new \grade_category($this->getDataGenerator()->create_grade_category($params));
$catitem = $category->get_grade_item();
// Now set a calculation.
@@ -174,11 +175,11 @@ class core_gradelib_testcase extends advanced_testcase {
* Tests for the grade_get_date_for_user_grade function.
*
* @dataProvider grade_get_date_for_user_grade_provider
- * @param stdClass $grade
- * @param stdClass $user
+ * @param \stdClass $grade
+ * @param \stdClass $user
* @param int $expected
*/
- public function test_grade_get_date_for_user_grade(stdClass $grade, stdClass $user, ?int $expected): void {
+ public function test_grade_get_date_for_user_grade(\stdClass $grade, \stdClass $user, ?int $expected): void {
$this->assertEquals($expected, grade_get_date_for_user_grade($grade, $user));
}
@@ -256,9 +257,9 @@ class core_gradelib_testcase extends advanced_testcase {
// Setup some basics.
$course = $this->getDataGenerator()->create_course();
- $context = context_course::instance($course->id);
+ $context = \context_course::instance($course->id);
- $cache = cache::make('core', 'grade_letters');
+ $cache = \cache::make('core', 'grade_letters');
$letters = $cache->get($context->id);
// Make sure the cache is empty.
@@ -281,16 +282,16 @@ class core_gradelib_testcase extends advanced_testcase {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
- $context = context_course::instance($course->id);
+ $context = \context_course::instance($course->id);
- $cache = cache::make('core', 'grade_letters');
+ $cache = \cache::make('core', 'grade_letters');
$letters = $cache->get($context->id);
// Make sure the cache is empty.
$this->assertFalse($letters);
// Add a grade letter to the course.
- $letter = new stdClass();
+ $letter = new \stdClass();
$letter->letter = 'M';
$letter->lowerboundary = '100';
$letter->contextid = $context->id;
diff --git a/lib/tests/grades_externallib_test.php b/lib/tests/grades_external_test.php
similarity index 90%
rename from lib/tests/grades_externallib_test.php
rename to lib/tests/grades_external_test.php
index 01807e63e51..145658d2279 100644
--- a/lib/tests/grades_externallib_test.php
+++ b/lib/tests/grades_external_test.php
@@ -14,15 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for the grade API at /lib/classes/grades_external.php
- *
- * @package core_grades
- * @category external
- * @copyright 2012 Andrew Davis
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.7
- */
+namespace core;
+
+use core_grades_external;
defined('MOODLE_INTERNAL') || die();
@@ -33,12 +27,14 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
/**
* Grades functions unit tests
*
- * @package core_grades
- * @category external
+ * Unit tests for the grade API at /lib/classes/grades_external.php
+ *
+ * @package core
+ * @category test
* @copyright 2012 Andrew Davis
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_grades_external_testcase extends externallib_advanced_testcase {
+class grades_external_test extends \externallib_advanced_testcase {
/**
* Load initial test information
@@ -53,7 +49,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
// Adds a course, a teacher, 2 students, an assignment and grades for the students.
$course = $this->getDataGenerator()->create_course();
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
@@ -69,7 +65,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$parent = $this->getDataGenerator()->create_user();
$this->setUser($parent);
- $student1context = context_user::instance($student1->id);
+ $student1context = \context_user::instance($student1->id);
// Creates a new role, gives it the capability and gives $USER that role.
$parentroleid = $this->assignUserCapability('moodle/grade:viewall', $student1context->id);
// Enrol the user in the course using the new role.
@@ -85,7 +81,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
assign_grade_item_update($assignment, $studentgrades);
// Insert a custom grade scale to be used by an outcome.
- $gradescale = new grade_scale();
+ $gradescale = new \grade_scale();
$gradescale->name = 'unittestscale3';
$gradescale->courseid = $course->id;
$gradescale->userid = 0;
@@ -94,15 +90,15 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$gradescale->insert();
// Insert an outcome.
- $data = new stdClass();
+ $data = new \stdClass();
$data->courseid = $course->id;
$data->fullname = 'Team work';
$data->shortname = 'Team work';
$data->scaleid = $gradescale->id;
- $outcome = new grade_outcome($data, false);
+ $outcome = new \grade_outcome($data, false);
$outcome->insert();
- $outcomegradeitem = new grade_item();
+ $outcomegradeitem = new \grade_item();
$outcomegradeitem->itemname = $outcome->shortname;
$outcomegradeitem->itemtype = 'mod';
$outcomegradeitem->itemmodule = 'assign';
@@ -119,7 +115,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$outcomegradeitem->hidden = '';
$outcomegradeitem->insert();
- $assignmentgradeitem = grade_item::fetch(
+ $assignmentgradeitem = \grade_item::fetch(
array(
'itemtype' => 'mod',
'itemmodule' => 'assign',
@@ -158,7 +154,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$assigmentcm->id,
array($student1->id)
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$this->assertEquals($student1rawgrade, $this->get_activity_student_grade($grades, $assigmentcm->id, $student1->id));
// Teacher requesting all the grades of student1 in a course.
@@ -168,7 +164,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
null,
array($student1->id)
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$this->assertTrue(count($grades['items']) == 2);
$this->assertEquals($student1rawgrade, $this->get_activity_student_grade($grades, $assigmentcm->id, $student1->id));
$this->assertEquals($student1rawgrade, $this->get_activity_student_grade($grades, 'course', $student1->id));
@@ -184,7 +180,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
null,
array($student1->id, $student2->id)
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$this->assertTrue(count($grades['items']) == 2);
$this->assertTrue(count($grades['items'][0]['grades']) == 2);
$this->assertTrue(count($grades['items'][1]['grades']) == 2);
@@ -199,7 +195,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array($student2->id)
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -213,7 +209,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array($student1->id)
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -226,7 +222,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array($student2->id)
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -239,7 +235,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array($student1->id, $student2->id)
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -252,7 +248,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array()
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -264,7 +260,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$assigmentcm->id,
array($student1->id, $student2->id)
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$this->assertEquals($student1rawgrade, $this->get_activity_student_grade($grades, $assigmentcm->id, $student1->id));
$this->assertEquals($student2rawgrade, $this->get_activity_student_grade($grades, $assigmentcm->id, $student2->id));
@@ -274,7 +270,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
'mod_assign',
$assigmentcm->id
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$activity = $this->get_activity($grades, $assigmentcm->id);
$this->assertEquals($activity['name'], $assignmentname);
$this->assertEquals(count($activity['grades']), 0);
@@ -283,7 +279,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$grades = core_grades_external::get_grades(
$course->id
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$this->assertTrue(count($grades['items']) == 2);
$activity = $this->get_activity($grades, $assigmentcm->id);
@@ -303,7 +299,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array(),
array('hidden' => 1)
);
- $result = external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
$this->assertTrue($result == GRADE_UPDATE_OK);
// Check it's definitely hidden.
@@ -318,7 +314,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
$assigmentcm->id,
array($student1->id)
);
- $grades = external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
+ $grades = \external_api::clean_returnvalue(core_grades_external::get_grades_returns(), $grades);
$this->assertEquals($student1rawgrade, $this->get_activity_student_grade($grades, $assigmentcm->id, $student1->id));
}
@@ -418,7 +414,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array(),
array('grademax' => $changedmax)
);
- $result = external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
$this->assertTrue($result == GRADE_UPDATE_OK);
$grades = grade_get_grades($course->id, 'mod', 'assign', $assignment->id);
$this->assertTrue($grades->items[0]->grademax == $changedmax);
@@ -433,7 +429,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
0,
array(array('studentid' => $student1->id, 'grade' => $student1grade))
);
- $result = external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
$this->assertTrue($result == GRADE_UPDATE_OK);
$grades = grade_get_grades($course->id, 'mod', 'assign', $assignment->id, array($student1->id));
$this->assertTrue($grades->items[0]->grades[$student1->id]->grade == $student1grade);
@@ -452,7 +448,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array('studentid' => $student2->id, 'grade' => $student2grade)
)
);
- $result = external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
$this->assertTrue($result == GRADE_UPDATE_OK);
$grades = grade_get_grades($course->id, 'mod', 'assign', $assignment->id, array($student1->id, $student2->id));
$this->assertTrue($grades->items[0]->grades[$student1->id]->grade == $student1grade);
@@ -471,7 +467,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array( array('studentid' => $student1->id, 'grade' => $student1grade))
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -488,7 +484,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array( array('studentid' => $student1->id, 'grade' => $student1grade))
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
@@ -505,13 +501,13 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array('hidden' => 1)
);
$this->fail('moodle_exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertTrue(true);
}
// Give the student role 'moodle/grade:hide' and they should now be able to hide the grade item.
$studentrole = $DB->get_record('role', array('shortname' => 'student'));
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
assign_capability('moodle/grade:hide', CAP_ALLOW, $studentrole->id, $coursecontext->id);
accesslib_clear_all_caches_for_unit_testing();
@@ -528,7 +524,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
array(),
array('hidden' => 1)
);
- $result = external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grades_external::update_grades_returns(), $result);
$this->assertTrue($result == GRADE_UPDATE_OK);
$grades = grade_get_grades($course->id, 'mod', 'assign', $assignment->id);
$this->assertTrue($grades->items[0]->hidden == 1);
@@ -548,7 +544,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
// Test the most basic gradecategory creation.
$status1 = core_grades_external::create_gradecategory($course->id, 'Test Category 1', []);
- $courseparentcat = new grade_category(['courseid' => $course->id, 'depth' => 1], true);
+ $courseparentcat = new \grade_category(['courseid' => $course->id, 'depth' => 1], true);
$record1 = $DB->get_record('grade_categories', ['id' => $status1['categoryid']]);
$this->assertEquals('Test Category 1', $record1->fullname);
// Confirm that the parent category for this category is the top level category for the course.
@@ -587,7 +583,7 @@ class core_grades_external_testcase extends externallib_advanced_testcase {
];
$status3 = core_grades_external::create_gradecategory($course->id, 'Test Category 3', $customopts);
- $cat3 = new grade_category(['courseid' => $course->id, 'id' => $status3['categoryid']], true);
+ $cat3 = new \grade_category(['courseid' => $course->id, 'id' => $status3['categoryid']], true);
$cat3->load_grade_item();
// Lets check all of the data is in the right shape.
diff --git a/lib/tests/grading_externallib_test.php b/lib/tests/grading_external_test.php
similarity index 96%
rename from lib/tests/grading_externallib_test.php
rename to lib/tests/grading_external_test.php
index 7d2984facd1..2d1ef1f364d 100644
--- a/lib/tests/grading_externallib_test.php
+++ b/lib/tests/grading_external_test.php
@@ -14,6 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
+use core_grading_external;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -23,12 +27,12 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
/**
* Unit tests for the grading API defined in core_grading_external class.
*
- * @package core_grading
- * @category external
+ * @package core
+ * @category test
* @copyright 2013 Paul Charsley
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_grading_externallib_testcase extends externallib_advanced_testcase {
+class grading_external_test extends \externallib_advanced_testcase {
/**
* Test get_definitions
@@ -56,9 +60,9 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$enrolid = $DB->insert_record('enrol', $manualenroldata);
// Create a teacher and give them capabilities.
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$roleid = $this->assignUserCapability('moodle/course:viewparticipants', $coursecontext->id, 3);
- $modulecontext = context_module::instance($cm->cmid);
+ $modulecontext = \context_module::instance($cm->cmid);
$this->assignUserCapability('mod/assign:grade', $modulecontext->id, $roleid);
// Create the teacher's enrolment record.
@@ -141,7 +145,7 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$cmids = array ($cm->cmid);
$areaname = 'submissions';
$result = core_grading_external::get_definitions($cmids, $areaname);
- $result = external_api::clean_returnvalue(core_grading_external::get_definitions_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grading_external::get_definitions_returns(), $result);
$this->assertEquals(1, count($result['areas']));
$this->assertEquals(1, count($result['areas'][0]['definitions']));
@@ -200,9 +204,9 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$enrolid = $DB->insert_record('enrol', $manualenroldata);
// Create a teacher and give them capabilities.
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$roleid = $this->assignUserCapability('moodle/course:viewparticipants', $coursecontext->id, 3);
- $modulecontext = context_module::instance($assign->cmid);
+ $modulecontext = \context_module::instance($assign->cmid);
$this->assignUserCapability('mod/assign:grade', $modulecontext->id, $roleid);
// Create the teacher's enrolment record.
@@ -213,7 +217,7 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
// Create a student with an assignment grade.
$student = self::getDataGenerator()->create_user();
- $assigngrade = new stdClass();
+ $assigngrade = new \stdClass();
$assigngrade->assignment = $assign->id;
$assigngrade->userid = $student->id;
$assigngrade->timecreated = time();
@@ -286,7 +290,7 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
// Call the external function.
$result = core_grading_external::get_gradingform_instances($definitionid, 0);
- $result = external_api::clean_returnvalue(core_grading_external::get_gradingform_instances_returns(), $result);
+ $result = \external_api::clean_returnvalue(core_grading_external::get_gradingform_instances_returns(), $result);
$this->assertEquals(1, count($result['instances']));
$this->assertEquals($USER->id, $result['instances'][0]['raterid']);
@@ -315,8 +319,8 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$params['course'] = $course->id;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
- $context = context_module::instance($cm->id);
- $coursecontext = context_course::instance($course->id);
+ $context = \context_module::instance($cm->id);
+ $coursecontext = \context_course::instance($course->id);
// Create the teacher.
$teacher = self::getDataGenerator()->create_user();
@@ -554,8 +558,8 @@ class core_grading_externallib_testcase extends externallib_advanced_testcase {
$params['course'] = $course->id;
$instance = $generator->create_instance($params);
$cm = get_coursemodule_from_instance('assign', $instance->id);
- $context = context_module::instance($cm->id);
- $coursecontext = context_course::instance($course->id);
+ $context = \context_module::instance($cm->id);
+ $coursecontext = \context_course::instance($course->id);
// Create the teacher.
$teacher = self::getDataGenerator()->create_user();
diff --git a/lib/tests/grouplib_test.php b/lib/tests/grouplib_test.php
index a1e3385dbbb..e1510feac63 100644
--- a/lib/tests/grouplib_test.php
+++ b/lib/tests/grouplib_test.php
@@ -14,23 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
- * Tests groups subsystems.
+ * Unit tests for lib/grouplib.php
*
- * @package core_group
- * @category phpunit
+ * @package core
* @copyright 2007 onwards Martin Dougiamas (http://dougiamas.com)
* @author Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Unit tests for lib/grouplib.php
- * @group core_group
- */
-class core_grouplib_testcase extends advanced_testcase {
+class grouplib_test extends \advanced_testcase {
public function test_groups_get_group_by_idnumber() {
$this->resetAfterTest(true);
@@ -184,7 +178,7 @@ class core_grouplib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$course = $generator->create_course();
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$student1 = $generator->create_user();
$student2 = $generator->create_user();
$plugin = enrol_get_plugin('manual');
@@ -376,7 +370,7 @@ class core_grouplib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$course = $generator->create_course();
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$student1 = $generator->create_user();
$student2 = $generator->create_user();
$plugin = enrol_get_plugin('manual');
@@ -411,7 +405,7 @@ class core_grouplib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$course = $generator->create_course();
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$student1 = $generator->create_user();
$student2 = $generator->create_user();
$plugin = enrol_get_plugin('manual');
@@ -444,7 +438,7 @@ class core_grouplib_testcase extends advanced_testcase {
$generator = $this->getDataGenerator();
$course = $generator->create_course();
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$student1 = $generator->create_user();
$student2 = $generator->create_user();
$plugin = enrol_get_plugin('manual');
@@ -465,7 +459,7 @@ class core_grouplib_testcase extends advanced_testcase {
groups_add_member($group->id, $student1->id);
// Test with members at any group and with an invalid $context.
- $syscontext = context_system::instance();
+ $syscontext = \context_system::instance();
$this->expectException('coding_exception');
list($sql, $params) = groups_get_members_ids_sql(USERSWITHOUTGROUP, $syscontext);
}
@@ -721,7 +715,7 @@ class core_grouplib_testcase extends advanced_testcase {
// Create a course category, course and groups.
$cat = $generator->create_category(array('parent' => 0));
$course = $generator->create_course(array('category' => $cat->id));
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$group1 = $generator->create_group(array('courseid' => $course->id, 'name' => 'Group 1'));
$group2 = $generator->create_group(array('courseid' => $course->id, 'name' => 'Group 2'));
$group3 = $generator->create_group(array('courseid' => $course->id, 'name' => 'Group 3'));
@@ -973,7 +967,7 @@ class core_grouplib_testcase extends advanced_testcase {
// Generate data.
$course = $this->getDataGenerator()->create_course();
- $record = new stdClass();
+ $record = new \stdClass();
$record->courseid = $course->id;
$group1 = $this->getDataGenerator()->create_group($record);
$group2 = $this->getDataGenerator()->create_group($record);
@@ -1207,7 +1201,7 @@ class core_grouplib_testcase extends advanced_testcase {
protected function make_group_list($number) {
$testgroups = array();
for ($a = 0; $a < $number; $a++) {
- $grp = new stdClass();
+ $grp = new \stdClass();
$grp->id = 100 + $a;
$grp->name = 'test group ' . $grp->id;
$testgroups[$grp->id] = $grp;
@@ -1281,7 +1275,7 @@ class core_grouplib_testcase extends advanced_testcase {
// Create a course category, course and groups.
$cat = $generator->create_category(array('parent' => 0));
$course = $generator->create_course(array('category' => $cat->id));
- $coursecontext = context_course::instance($course->id);
+ $coursecontext = \context_course::instance($course->id);
$group1 = $generator->create_group(array('courseid' => $course->id, 'name' => 'Group 1'));
$group2 = $generator->create_group(array('courseid' => $course->id, 'name' => 'Group 2'));
$group3 = $generator->create_group(array('courseid' => $course->id, 'name' => 'Group 3'));
diff --git a/lib/tests/html2text_test.php b/lib/tests/html2text_test.php
index 692481c83bf..af027171ecc 100644
--- a/lib/tests/html2text_test.php
+++ b/lib/tests/html2text_test.php
@@ -14,22 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
* Tests our html2text hacks
*
* Note: includes original tests from testweblib.php
*
* @package core
- * @category phpunit
+ * @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();
-
-
-class core_html2text_testcase extends basic_testcase {
+class html2text_test extends \basic_testcase {
/**
* ALT as image replacements.
diff --git a/lib/tests/htmlpurifier_test.php b/lib/tests/htmlpurifier_test.php
index f1ae916c93a..dc9137a5f8c 100644
--- a/lib/tests/htmlpurifier_test.php
+++ b/lib/tests/htmlpurifier_test.php
@@ -14,27 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for the HTMLPurifier integration
- *
- * @package core
- * @category phpunit
- * @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();
-
+namespace core;
/**
* HTMLPurifier test case
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_htmlpurifier_testcase extends basic_testcase {
+class htmlpurifier_test extends \basic_testcase {
/**
* Verify _blank target is allowed.
diff --git a/lib/tests/ip_utils_test.php b/lib/tests/ip_utils_test.php
index 238d45796b7..b142c0e2a30 100644
--- a/lib/tests/ip_utils_test.php
+++ b/lib/tests/ip_utils_test.php
@@ -14,15 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Contains the test class testing the \core\ip_utils static helper class functions.
- *
- * @package core
- * @copyright 2016 Jake Dallimore
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-defined('MOODLE_INTERNAL') || die();
+namespace core;
/**
* This tests the static helper functions contained in the class '\core\ip_utils'.
@@ -31,7 +24,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2016 Jake Dallimore
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_ip_utils_testcase extends basic_testcase {
+class ip_utils_test extends \basic_testcase {
/**
* Test for \core\ip_utils::is_domain_name().
*
diff --git a/lib/tests/jquery_test.php b/lib/tests/jquery_test.php
index c436f35736a..b56226bfa88 100644
--- a/lib/tests/jquery_test.php
+++ b/lib/tests/jquery_test.php
@@ -14,19 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
* Test jQuery integration.
*
- * @package core
- * @category phpunit
- * @copyright 2014 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-
-/**
* This is not a complete jquery test, it just validates
* Moodle integration is set up properly.
*
@@ -34,11 +26,11 @@ defined('MOODLE_INTERNAL') || die();
* verify it actually works in browser.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2014 Petr Skoda
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_jquery_testcase extends basic_testcase {
+class jquery_test extends \basic_testcase {
public function test_plugins_file() {
global $CFG;
diff --git a/lib/tests/ldaplib_test.php b/lib/tests/ldaplib_test.php
index 57909b9e27b..c0e33b1bd3f 100644
--- a/lib/tests/ldaplib_test.php
+++ b/lib/tests/ldaplib_test.php
@@ -14,21 +14,22 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * ldap tests.
- *
- * @package core
- * @category phpunit
- * @copyright Damyon Wiese, Iñaki Arenaza 2014
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . '/ldaplib.php');
-class core_ldaplib_testcase extends advanced_testcase {
+/**
+ * ldap tests.
+ *
+ * @package core
+ * @category test
+ * @copyright Damyon Wiese, Iñaki Arenaza 2014
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ */
+class ldaplib_test extends \advanced_testcase {
public function test_ldap_addslashes() {
// See http://tools.ietf.org/html/rfc4514#section-5.2 if you want
diff --git a/lib/tests/lock_config_test.php b/lib/tests/lock_config_test.php
index 611eca57cdd..39c0dab3326 100644
--- a/lib/tests/lock_config_test.php
+++ b/lib/tests/lock_config_test.php
@@ -14,27 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * lock unit tests
- *
- * @package core
- * @category lock
- * @copyright 2013 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
+namespace core;
/**
* Unit tests for our locking configuration.
*
* @package core
- * @category lock
+ * @category test
* @copyright 2013 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class lock_config_testcase extends advanced_testcase {
+class lock_config_test extends \advanced_testcase {
/**
* Tests the static parse charset method
@@ -62,7 +52,7 @@ class lock_config_testcase extends advanced_testcase {
try {
$factory = \core\lock\lock_config::get_lock_factory('cache');
$this->fail('Exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertInstanceOf('coding_exception', $ex);
}
@@ -77,7 +67,7 @@ class lock_config_testcase extends advanced_testcase {
try {
$factory = \core\lock\lock_config::get_lock_factory('cache');
$this->fail('Exception expected');
- } catch (moodle_exception $ex) {
+ } catch (\moodle_exception $ex) {
$this->assertInstanceOf('coding_exception', $ex);
}
diff --git a/lib/tests/lock_test.php b/lib/tests/lock_test.php
index d7c32111223..39ec94b9a53 100644
--- a/lib/tests/lock_test.php
+++ b/lib/tests/lock_test.php
@@ -14,17 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * lock unit tests
- *
- * @package core
- * @category test
- * @copyright 2013 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
+namespace core;
/**
* Unit tests for our locking implementations.
@@ -34,7 +24,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2013 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class lock_testcase extends advanced_testcase {
+class lock_test extends \advanced_testcase {
/**
* Some lock types will store data in the database.
diff --git a/lib/tests/markdown_test.php b/lib/tests/markdown_test.php
index af4d282ebe8..3f75534e99b 100644
--- a/lib/tests/markdown_test.php
+++ b/lib/tests/markdown_test.php
@@ -14,19 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
* Test markdown text format.
*
- * @package core
- * @category phpunit
- * @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();
-
-
-/**
* This is not a complete markdown test, it just validates
* Moodle integration works.
*
@@ -34,11 +26,11 @@ defined('MOODLE_INTERNAL') || die();
* for more format information.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2012 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_markdown_testcase extends basic_testcase {
+class markdown_test extends \basic_testcase {
public function test_paragraphs() {
$text = "one\n\ntwo";
diff --git a/lib/tests/mathslib_test.php b/lib/tests/mathslib_test.php
index b1e71f7a4e3..8e8368add18 100644
--- a/lib/tests/mathslib_test.php
+++ b/lib/tests/mathslib_test.php
@@ -14,6 +14,15 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
+use calc_formula;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->libdir . '/mathslib.php');
+
/**
* Unit tests of mathslib wrapper and underlying EvalMath library.
*
@@ -22,14 +31,7 @@
* @copyright 2007 Petr Skoda {@link http://skodak.org}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/mathslib.php');
-
-
-class core_mathslib_testcase extends basic_testcase {
+class mathslib_test extends \basic_testcase {
/**
* Tests the basic formula evaluation.
diff --git a/lib/tests/medialib_test.php b/lib/tests/medialib_test.php
index bd3ed759429..c6df5a07058 100644
--- a/lib/tests/medialib_test.php
+++ b/lib/tests/medialib_test.php
@@ -14,6 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
+use core_media_manager;
+use media_test_plugin;
+
+defined('MOODLE_INTERNAL') || die();
+require_once(__DIR__ . '/fixtures/testable_core_media_player.php');
+
/**
* Test classes for handling embedded media (audio/video).
*
@@ -22,14 +30,7 @@
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__ . '/fixtures/testable_core_media_player.php');
-
-/**
- * Test script for media embedding.
- */
-class core_medialib_testcase extends advanced_testcase {
+class medialib_test extends \advanced_testcase {
/**
* Pre-test setup. Preserves $CFG.
@@ -55,7 +56,7 @@ class core_medialib_testcase extends advanced_testcase {
*/
private function pretend_to_be_safari() {
// Pretend to be using Safari browser (must support mp4 for tests to work).
- core_useragent::instance(true, 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) ' .
+ \core_useragent::instance(true, 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) ' .
'AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1');
}
@@ -64,7 +65,7 @@ class core_medialib_testcase extends advanced_testcase {
*/
private function pretend_to_be_firefox() {
// Pretend to be using Firefox browser (must support ogg for tests to work).
- core_useragent::instance(true, 'Mozilla/5.0 (X11; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0 ');
+ \core_useragent::instance(true, 'Mozilla/5.0 (X11; Linux x86_64; rv:46.0) Gecko/20100101 Firefox/46.0 ');
}
/**
@@ -73,11 +74,11 @@ class core_medialib_testcase extends advanced_testcase {
public function test_get_filename() {
$manager = core_media_manager::instance();
- $this->assertSame('frog.mp4', $manager->get_filename(new moodle_url(
+ $this->assertSame('frog.mp4', $manager->get_filename(new \moodle_url(
'/pluginfile.php/312/mod_page/content/7/frog.mp4')));
// This should work even though slasharguments is true, because we want
// it to support 'legacy' links if somebody toggles the option later.
- $this->assertSame('frog.mp4', $manager->get_filename(new moodle_url(
+ $this->assertSame('frog.mp4', $manager->get_filename(new \moodle_url(
'/pluginfile.php?file=/312/mod_page/content/7/frog.mp4')));
}
@@ -87,13 +88,13 @@ class core_medialib_testcase extends advanced_testcase {
public function test_get_extension() {
$manager = core_media_manager::instance();
- $this->assertSame('mp4', $manager->get_extension(new moodle_url(
+ $this->assertSame('mp4', $manager->get_extension(new \moodle_url(
'/pluginfile.php/312/mod_page/content/7/frog.mp4')));
- $this->assertSame('', $manager->get_extension(new moodle_url(
+ $this->assertSame('', $manager->get_extension(new \moodle_url(
'/pluginfile.php/312/mod_page/content/7/frog')));
- $this->assertSame('mp4', $manager->get_extension(new moodle_url(
+ $this->assertSame('mp4', $manager->get_extension(new \moodle_url(
'/pluginfile.php?file=/312/mod_page/content/7/frog.mp4')));
- $this->assertSame('', $manager->get_extension(new moodle_url(
+ $this->assertSame('', $manager->get_extension(new \moodle_url(
'/pluginfile.php?file=/312/mod_page/content/7/frog')));
}
@@ -104,9 +105,9 @@ class core_medialib_testcase extends advanced_testcase {
$test = new media_test_plugin(1, 13, ['tst', 'test']);
// Some example URLs.
- $supported1 = new moodle_url('http://example.org/1.test');
- $supported2 = new moodle_url('http://example.org/2.TST');
- $unsupported = new moodle_url('http://example.org/2.jpg');
+ $supported1 = new \moodle_url('http://example.org/1.test');
+ $supported2 = new \moodle_url('http://example.org/2.TST');
+ $unsupported = new \moodle_url('http://example.org/2.jpg');
// No URLs => none.
$result = $test->list_supported_urls(array());
@@ -163,7 +164,7 @@ class core_medialib_testcase extends advanced_testcase {
*/
public function test_can_embed_url() {
// All players are initially disabled, so mp4 cannot be rendered.
- $url = new moodle_url('http://example.org/test.mp4');
+ $url = new \moodle_url('http://example.org/test.mp4');
$manager = core_media_manager::instance();
$this->assertFalse($manager->can_embed_url($url));
@@ -201,7 +202,7 @@ class core_medialib_testcase extends advanced_testcase {
$link = 'mediafallbacklink';
$test = 'mediaplugin_test';
- $url = new moodle_url('http://example.org/test.mp4');
+ $url = new \moodle_url('http://example.org/test.mp4');
// All plugins disabled, NOLINK option.
\core\plugininfo\media::set_enabled_plugins('');
@@ -225,7 +226,7 @@ class core_medialib_testcase extends advanced_testcase {
$mediaformats = array('mp3', 'mp4');
foreach ($mediaformats as $format) {
- $url = new moodle_url('http://example.org/test.' . $format);
+ $url = new \moodle_url('http://example.org/test.' . $format);
$textwithlink = $manager->embed_url($url);
$textwithoutlink = $manager->embed_url($url, 0, 0, '', array(core_media_manager::OPTION_NO_LINK => true));
@@ -273,12 +274,12 @@ class core_medialib_testcase extends advanced_testcase {
$manager = core_media_manager::instance();
// Without any options...
- $url = new moodle_url('http://example.org/test.swf');
+ $url = new \moodle_url('http://example.org/test.swf');
$t = $manager->embed_url($url);
$this->assertStringNotContainsString('', $t);
// ...and with the 'no it's safe, I checked it' option.
- $url = new moodle_url('http://example.org/test.swf');
+ $url = new \moodle_url('http://example.org/test.swf');
$t = $manager->embed_url($url, '', 0, 0, array(core_media_manager::OPTION_TRUSTED => true));
$this->assertStringContainsString('', $t);
}
@@ -297,7 +298,7 @@ class core_medialib_testcase extends advanced_testcase {
$manager = core_media_manager::instance();
// Format: mp3.
- $url = new moodle_url('http://example.org/pluginfile.php?file=x/y/z/test.mp3');
+ $url = new \moodle_url('http://example.org/pluginfile.php?file=x/y/z/test.mp3');
$t = $manager->embed_url($url);
$this->assertStringContainsString('', $t);
}
@@ -314,13 +315,13 @@ class core_medialib_testcase extends advanced_testcase {
$options = array(core_media_manager::OPTION_FALLBACK_TO_BLANK => true);
// Embed that does match something should still include the link too.
- $url = new moodle_url('http://example.org/test.ogg');
+ $url = new \moodle_url('http://example.org/test.ogg');
$t = $manager->embed_url($url, '', 0, 0, $options);
$this->assertStringContainsString('', $t);
$this->assertStringContainsString('mediafallbacklink', $t);
// Embed that doesn't match something should be totally blank.
- $url = new moodle_url('http://example.org/test.mp4');
+ $url = new \moodle_url('http://example.org/test.mp4');
$t = $manager->embed_url($url, '', 0, 0, $options);
$this->assertSame('', $t);
}
@@ -339,7 +340,7 @@ class core_medialib_testcase extends advanced_testcase {
// through.
\core\plugininfo\media::set_enabled_plugins('html5video');
$manager = core_media_manager::instance();
- $url = new moodle_url('http://example.org/test.mp4');
+ $url = new \moodle_url('http://example.org/test.mp4');
// HTML5 default size - specifies core width and does not specify height.
$t = $manager->embed_url($url);
@@ -352,7 +353,7 @@ class core_medialib_testcase extends advanced_testcase {
$this->assertStringContainsString('height="101"', $t);
// HTML5 size specified in url, overrides call.
- $url = new moodle_url('http://example.org/test.mp4?d=123x456');
+ $url = new \moodle_url('http://example.org/test.mp4?d=123x456');
$t = $manager->embed_url($url, '', '666', '101');
$this->assertStringContainsString('width="123"', $t);
$this->assertStringContainsString('height="456"', $t);
@@ -368,7 +369,7 @@ class core_medialib_testcase extends advanced_testcase {
// html5video.
\core\plugininfo\media::set_enabled_plugins('html5video');
$manager = core_media_manager::instance();
- $url = new moodle_url('http://example.org/test.mp4');
+ $url = new \moodle_url('http://example.org/test.mp4');
// HTML5 default name - use filename.
$t = $manager->embed_url($url);
@@ -425,10 +426,10 @@ class core_medialib_testcase extends advanced_testcase {
// MP4, OGV, WebM and FLV.
$urls = array(
- new moodle_url('http://example.org/test.mp4'),
- new moodle_url('http://example.org/test.ogv'),
- new moodle_url('http://example.org/test.webm'),
- new moodle_url('http://example.org/test.flv'),
+ new \moodle_url('http://example.org/test.mp4'),
+ new \moodle_url('http://example.org/test.ogv'),
+ new \moodle_url('http://example.org/test.webm'),
+ new \moodle_url('http://example.org/test.flv'),
);
// Enable html5 and "test" ("test" first).
@@ -463,14 +464,14 @@ class core_medialib_testcase extends advanced_testcase {
* Make sure the instance() method returns singleton for the same page and different object for another page
*/
public function test_initialise() {
- $moodlepage1 = new moodle_page();
+ $moodlepage1 = new \moodle_page();
$mediamanager1 = core_media_manager::instance($moodlepage1);
$mediamanager2 = core_media_manager::instance($moodlepage1);
$this->assertSame($mediamanager1, $mediamanager2);
- $moodlepage3 = new moodle_page();
+ $moodlepage3 = new \moodle_page();
$mediamanager3 = core_media_manager::instance($moodlepage3);
$this->assertNotSame($mediamanager1, $mediamanager3);
@@ -484,7 +485,7 @@ class core_medialib_testcase extends advanced_testcase {
* @return string Comma-separated list of players
*/
public function get_players_test($manager) {
- $method = new ReflectionMethod("core_media_manager", "get_players");
+ $method = new \ReflectionMethod("core_media_manager", "get_players");
$method->setAccessible(true);
$players = $method->invoke($manager);
$out = '';
diff --git a/lib/tests/message_test.php b/lib/tests/message_test.php
index eefd415a42d..acdc2572080 100644
--- a/lib/tests/message_test.php
+++ b/lib/tests/message_test.php
@@ -14,28 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * 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);
}
/**
diff --git a/lib/tests/messageinbound_test.php b/lib/tests/messageinbound_test.php
index 6e8cb5b8225..ab70d2cb3ea 100644
--- a/lib/tests/messageinbound_test.php
+++ b/lib/tests/messageinbound_test.php
@@ -15,27 +15,31 @@
// along with Moodle. If not, see .
/**
+ * Test script for message class.
+ *
* Test classes for \core\message\inbound.
*
- * @package core_message
+ * @package core
* @category test
* @copyright 2015 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-defined('MOODLE_INTERNAL') || die();
+namespace core;
-global $CFG;
+defined('MOODLE_INTERNAL') || die();
/**
* Test script for message class.
*
- * @package core_message
+ * Test classes for \core\message\inbound.
+ *
+ * @package core
* @category test
* @copyright 2015 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_messageinbound_testcase extends advanced_testcase {
+class messageinbound_test extends \advanced_testcase {
/**
* @dataProvider message_inbound_handler_trim_testprovider
@@ -43,9 +47,9 @@ class core_messageinbound_testcase extends advanced_testcase {
public function test_messageinbound_handler_trim($file, $source, $expectedplain, $expectedhtml) {
$this->resetAfterTest();
- $mime = Horde_Mime_Part::parseMessage($source);
+ $mime = \Horde_Mime_Part::parseMessage($source);
if ($plainpartid = $mime->findBody('plain')) {
- $messagedata = new stdClass();
+ $messagedata = new \stdClass();
$messagedata->plain = $mime->getPart($plainpartid)->getContents();
$messagedata->html = '';
@@ -58,7 +62,7 @@ class core_messageinbound_testcase extends advanced_testcase {
}
if ($htmlpartid = $mime->findBody('html')) {
- $messagedata = new stdClass();
+ $messagedata = new \stdClass();
$messagedata->plain = '';
$messagedata->html = $mime->getPart($htmlpartid)->getContents();
@@ -128,7 +132,7 @@ class core_messageinbound_testcase extends advanced_testcase {
}
if (null === $section) {
if (!isset($sections[$token])) {
- throw new coding_exception(sprintf(
+ throw new \coding_exception(sprintf(
'The test file "%s" should not contain a section named "%s".',
basename($file),
$token
@@ -143,7 +147,7 @@ class core_messageinbound_testcase extends advanced_testcase {
}
foreach ($sections as $section => $required) {
if ($required && !isset($data[$section])) {
- throw new coding_exception(sprintf(
+ throw new \coding_exception(sprintf(
'The test file "%s" must have a section named "%s".',
str_replace($fixturesdir.'/', '', $file),
$section
@@ -167,5 +171,5 @@ class test_handler extends \core\message\inbound\handler {
public function get_description() {}
- public function process_message(stdClass $record, stdClass $messagedata) {}
+ public function process_message(\stdClass $record, \stdClass $messagedata) {}
}
diff --git a/lib/tests/minify_test.php b/lib/tests/minify_test.php
index 173ff0a9603..679c19b3be9 100644
--- a/lib/tests/minify_test.php
+++ b/lib/tests/minify_test.php
@@ -14,22 +14,21 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * core_minify related tests.
- *
- * @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;
+use core_minify;
/**
* Class core_minify_testcase.
+ *
+ * core_minify related tests.
+ *
+ * @package core
+ * @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_minify_testcase extends advanced_testcase {
+class minify_test extends \advanced_testcase {
public function test_css() {
$css = "
body {
diff --git a/lib/tests/moodle_page_test.php b/lib/tests/moodle_page_test.php
index fac043cef9f..4930d481801 100644
--- a/lib/tests/moodle_page_test.php
+++ b/lib/tests/moodle_page_test.php
@@ -18,19 +18,31 @@
* Tests for the moodle_page class.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2009 Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+namespace core;
+
+use moodle_page;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . '/pagelib.php');
require_once($CFG->libdir . '/blocklib.php');
-
-class core_moodle_page_testcase extends advanced_testcase {
+/**
+ * Tests for the moodle_page class.
+ *
+ * @package core
+ * @category test
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \moodle_page
+ */
+class moodle_page_test extends \advanced_testcase {
/**
* @var testable_moodle_page
@@ -52,7 +64,7 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_setting_course_works() {
// Setup fixture.
$course = $this->getDataGenerator()->create_course();
- $this->testpage->set_context(context_system::instance()); // Avoid trying to set the context.
+ $this->testpage->set_context(\context_system::instance()); // Avoid trying to set the context.
// Exercise SUT.
$this->testpage->set_course($course);
// Validated.
@@ -63,7 +75,7 @@ class core_moodle_page_testcase extends advanced_testcase {
global $COURSE, $PAGE;
// Setup fixture.
$course = $this->getDataGenerator()->create_course();
- $this->testpage->set_context(context_system::instance()); // Avoid trying to set the context.
+ $this->testpage->set_context(\context_system::instance()); // Avoid trying to set the context.
$PAGE = $this->testpage;
// Exercise SUT.
$this->testpage->set_course($course);
@@ -76,7 +88,7 @@ class core_moodle_page_testcase extends advanced_testcase {
$originalcourse = $COURSE;
// Setup fixture.
$course = $this->getDataGenerator()->create_course();
- $this->testpage->set_context(context_system::instance()); // Avoid trying to set the context.
+ $this->testpage->set_context(\context_system::instance()); // Avoid trying to set the context.
// Exercise SUT.
$this->testpage->set_course($course);
// Validated.
@@ -85,38 +97,38 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_cannot_set_course_once_theme_set() {
// Setup fixture.
- $this->testpage->force_theme(theme_config::DEFAULT_THEME);
+ $this->testpage->force_theme(\theme_config::DEFAULT_THEME);
$course = $this->getDataGenerator()->create_course();
// Exercise SUT.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_course($course);
}
public function test_cannot_set_category_once_theme_set() {
// Setup fixture.
- $this->testpage->force_theme(theme_config::DEFAULT_THEME);
+ $this->testpage->force_theme(\theme_config::DEFAULT_THEME);
// Exercise SUT.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_category_by_id(123);
}
public function test_cannot_set_category_once_course_set() {
// Setup fixture.
$course = $this->getDataGenerator()->create_course();
- $this->testpage->set_context(context_system::instance()); // Avoid trying to set the context.
+ $this->testpage->set_context(\context_system::instance()); // Avoid trying to set the context.
$this->testpage->set_course($course);
// Exercise SUT.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_category_by_id(123);
}
public function test_categories_array_empty_for_front_page() {
global $SITE;
// Setup fixture.
- $this->testpage->set_context(context_system::instance()); // Avoid trying to set the context.
+ $this->testpage->set_context(\context_system::instance()); // Avoid trying to set the context.
$this->testpage->set_course($SITE);
// Exercise SUT and validate.
$this->assertEquals(array(), $this->testpage->categories);
@@ -124,25 +136,25 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_set_state_normal_path() {
$course = $this->getDataGenerator()->create_course();
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->testpage->set_course($course);
- $this->assertEquals(moodle_page::STATE_BEFORE_HEADER, $this->testpage->state);
+ $this->assertEquals(\moodle_page::STATE_BEFORE_HEADER, $this->testpage->state);
- $this->testpage->set_state(moodle_page::STATE_PRINTING_HEADER);
- $this->assertEquals(moodle_page::STATE_PRINTING_HEADER, $this->testpage->state);
+ $this->testpage->set_state(\moodle_page::STATE_PRINTING_HEADER);
+ $this->assertEquals(\moodle_page::STATE_PRINTING_HEADER, $this->testpage->state);
- $this->testpage->set_state(moodle_page::STATE_IN_BODY);
- $this->assertEquals(moodle_page::STATE_IN_BODY, $this->testpage->state);
+ $this->testpage->set_state(\moodle_page::STATE_IN_BODY);
+ $this->assertEquals(\moodle_page::STATE_IN_BODY, $this->testpage->state);
- $this->testpage->set_state(moodle_page::STATE_DONE);
- $this->assertEquals(moodle_page::STATE_DONE, $this->testpage->state);
+ $this->testpage->set_state(\moodle_page::STATE_DONE);
+ $this->assertEquals(\moodle_page::STATE_DONE, $this->testpage->state);
}
public function test_set_state_cannot_skip_one() {
// Exercise SUT.
- $this->expectException(coding_exception::class);
- $this->testpage->set_state(moodle_page::STATE_IN_BODY);
+ $this->expectException(\coding_exception::class);
+ $this->testpage->set_state(\moodle_page::STATE_IN_BODY);
}
public function test_header_printed_false_initially() {
@@ -152,12 +164,12 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_header_printed_becomes_true() {
$course = $this->getDataGenerator()->create_course();
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->testpage->set_course($course);
// Exercise SUT.
- $this->testpage->set_state(moodle_page::STATE_PRINTING_HEADER);
- $this->testpage->set_state(moodle_page::STATE_IN_BODY);
+ $this->testpage->set_state(\moodle_page::STATE_PRINTING_HEADER);
+ $this->testpage->set_state(\moodle_page::STATE_IN_BODY);
// Validated.
$this->assertTrue($this->testpage->headerprinted);
}
@@ -165,7 +177,7 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_set_context() {
// Setup fixture.
$course = $this->getDataGenerator()->create_course();
- $context = context_course::instance($course->id);
+ $context = \context_course::instance($course->id);
// Exercise SUT.
$this->testpage->set_context($context);
// Validated.
@@ -268,7 +280,7 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_set_url_using_moodle_url() {
global $CFG;
// Fixture setup.
- $url = new moodle_url('/mod/workshop/allocation.php', array('cmid' => 29, 'method' => 'manual'));
+ $url = new \moodle_url('/mod/workshop/allocation.php', array('cmid' => 29, 'method' => 'manual'));
// Exercise SUT.
$this->testpage->set_url($url);
// Validated.
@@ -335,7 +347,7 @@ class core_moodle_page_testcase extends advanced_testcase {
public function test_setting_course_sets_context() {
// Setup fixture.
$course = $this->getDataGenerator()->create_course();
- $context = context_course::instance($course->id);
+ $context = \context_course::instance($course->id);
// Exercise SUT.
$this->testpage->set_course($course);
@@ -353,7 +365,7 @@ class core_moodle_page_testcase extends advanced_testcase {
$this->testpage->set_category_by_id($cat->id);
// Validated.
$this->assertEquals($catdbrecord, $this->testpage->category);
- $this->assertSame(context_coursecat::instance($cat->id), $this->testpage->context);
+ $this->assertSame(\context_coursecat::instance($cat->id), $this->testpage->context);
}
public function test_set_nested_categories() {
@@ -394,7 +406,7 @@ class core_moodle_page_testcase extends advanced_testcase {
$forum = $this->getDataGenerator()->create_module('forum', array('course'=>$course->id));
$cm = get_coursemodule_from_id('forum', $forum->cmid);
// Exercise SUT.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_activity_record($forum);
}
@@ -406,7 +418,7 @@ class core_moodle_page_testcase extends advanced_testcase {
// Exercise SUT.
$this->testpage->set_cm($cm);
// Validated.
- $this->assertSame(context_module::instance($cm->id), $this->testpage->context);
+ $this->assertSame(\context_module::instance($cm->id), $this->testpage->context);
}
public function test_activity_record_loaded_if_not_set() {
@@ -442,7 +454,7 @@ class core_moodle_page_testcase extends advanced_testcase {
$this->testpage->set_cm($cm);
// Exercise SUT.
$forum->course = 13;
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_activity_record($forum);
}
@@ -454,7 +466,7 @@ class core_moodle_page_testcase extends advanced_testcase {
$this->testpage->set_cm($cm);
// Exercise SUT.
$forum->id = 13;
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_activity_record($forum);
}
@@ -491,7 +503,7 @@ class core_moodle_page_testcase extends advanced_testcase {
$cm = get_coursemodule_from_id('forum', $forum->cmid);
// Exercise SUT.
$cm->course = 13;
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->testpage->set_cm($cm, $course);
}
@@ -513,7 +525,7 @@ class core_moodle_page_testcase extends advanced_testcase {
// Setup fixture.
global $USER;
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->setAdminUser();
$USER->editing = true;
@@ -528,7 +540,7 @@ class core_moodle_page_testcase extends advanced_testcase {
// Setup fixture.
global $USER;
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->setAdminUser();
$USER->editing = false;
@@ -537,7 +549,7 @@ class core_moodle_page_testcase extends advanced_testcase {
}
public function test_default_editing_capabilities() {
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->setAdminUser();
// Validated.
@@ -545,7 +557,7 @@ class core_moodle_page_testcase extends advanced_testcase {
}
public function test_other_block_editing_cap() {
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->setAdminUser();
// Exercise SUT.
@@ -555,7 +567,7 @@ class core_moodle_page_testcase extends advanced_testcase {
}
public function test_other_editing_cap() {
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->setAdminUser();
// Exercise SUT.
@@ -567,7 +579,7 @@ class core_moodle_page_testcase extends advanced_testcase {
}
public function test_other_editing_caps() {
- $this->testpage->set_context(context_system::instance());
+ $this->testpage->set_context(\context_system::instance());
$this->setAdminUser();
// Exercise SUT.
@@ -606,7 +618,7 @@ class core_moodle_page_testcase extends advanced_testcase {
try {
$this->testpage->get_renderer('core', 'monkeys');
$this->fail('Request for renderer with invalid component didn\'t throw expected exception.');
- } catch (coding_exception $exception) {
+ } catch (\coding_exception $exception) {
$this->assertEquals('monkeys', $exception->debuginfo);
}
@@ -643,7 +655,7 @@ class core_moodle_page_testcase extends advanced_testcase {
try {
$this->testpage->get_renderer('core', 'monkeys');
$this->fail('Request for renderer with invalid component didn\'t throw expected exception.');
- } catch (coding_exception $exception) {
+ } catch (\coding_exception $exception) {
$this->assertEquals('monkeys', $exception->debuginfo);
}
@@ -672,7 +684,7 @@ class core_moodle_page_testcase extends advanced_testcase {
set_config('allowuserthemes', 1);
set_config('allowcohortthemes', 1);
- $systemctx = context_system::instance();
+ $systemctx = \context_system::instance();
set_config('theme', $sitetheme);
// Create user.
diff --git a/lib/tests/moodle_url_test.php b/lib/tests/moodle_url_test.php
index cef12dd1e80..a2de3e24941 100644
--- a/lib/tests/moodle_url_test.php
+++ b/lib/tests/moodle_url_test.php
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
* Tests for moodle_url.
*
@@ -21,67 +23,58 @@
* @copyright 2018 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Tests for moodle_url.
- *
- * @copyright 2018 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_moodle_url_testcase extends advanced_testcase {
+class moodle_url_test extends \advanced_testcase {
/**
* Test basic moodle_url construction.
*/
public function test_moodle_url_constructor() {
global $CFG;
- $url = new moodle_url('/index.php');
+ $url = new \moodle_url('/index.php');
$this->assertSame($CFG->wwwroot.'/index.php', $url->out());
- $url = new moodle_url('/index.php', array());
+ $url = new \moodle_url('/index.php', array());
$this->assertSame($CFG->wwwroot.'/index.php', $url->out());
- $url = new moodle_url('/index.php', array('id' => 2));
+ $url = new \moodle_url('/index.php', array('id' => 2));
$this->assertSame($CFG->wwwroot.'/index.php?id=2', $url->out());
- $url = new moodle_url('/index.php', array('id' => 'two'));
+ $url = new \moodle_url('/index.php', array('id' => 'two'));
$this->assertSame($CFG->wwwroot.'/index.php?id=two', $url->out());
- $url = new moodle_url('/index.php', array('id' => 1, 'cid' => '2'));
+ $url = new \moodle_url('/index.php', array('id' => 1, 'cid' => '2'));
$this->assertSame($CFG->wwwroot.'/index.php?id=1&cid=2', $url->out());
$this->assertSame($CFG->wwwroot.'/index.php?id=1&cid=2', $url->out(false));
- $url = new moodle_url('/index.php', null, 'test');
+ $url = new \moodle_url('/index.php', null, 'test');
$this->assertSame($CFG->wwwroot.'/index.php#test', $url->out());
- $url = new moodle_url('/index.php', array('id' => 2), 'test');
+ $url = new \moodle_url('/index.php', array('id' => 2), 'test');
$this->assertSame($CFG->wwwroot.'/index.php?id=2#test', $url->out());
}
/**
- * Tests moodle_url::get_path().
+ * Tests \moodle_url::get_path().
*/
public function test_moodle_url_get_path() {
- $url = new moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+ $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
$this->assertSame('/my/file/is/here.txt', $url->get_path());
- $url = new moodle_url('http://www.example.org/');
+ $url = new \moodle_url('http://www.example.org/');
$this->assertSame('/', $url->get_path());
- $url = new moodle_url('http://www.example.org/pluginfile.php/slash/arguments');
+ $url = new \moodle_url('http://www.example.org/pluginfile.php/slash/arguments');
$this->assertSame('/pluginfile.php/slash/arguments', $url->get_path());
$this->assertSame('/pluginfile.php', $url->get_path(false));
}
public function test_moodle_url_round_trip() {
$strurl = 'http://moodle.org/course/view.php?id=5';
- $url = new moodle_url($strurl);
+ $url = new \moodle_url($strurl);
$this->assertSame($strurl, $url->out(false));
$strurl = 'http://moodle.org/user/index.php?contextid=53&sifirst=M&silast=D';
- $url = new moodle_url($strurl);
+ $url = new \moodle_url($strurl);
$this->assertSame($strurl, $url->out(false));
}
@@ -90,23 +83,23 @@ class core_moodle_url_testcase extends advanced_testcase {
*/
public function test_moodle_url_empty_param_values() {
$strurl = 'http://moodle.org/course/view.php?id=0';
- $url = new moodle_url($strurl, array('id' => 0));
+ $url = new \moodle_url($strurl, array('id' => 0));
$this->assertSame($strurl, $url->out(false));
$strurl = 'http://moodle.org/course/view.php?id';
- $url = new moodle_url($strurl, array('id' => false));
+ $url = new \moodle_url($strurl, array('id' => false));
$this->assertSame($strurl, $url->out(false));
$strurl = 'http://moodle.org/course/view.php?id';
- $url = new moodle_url($strurl, array('id' => null));
+ $url = new \moodle_url($strurl, array('id' => null));
$this->assertSame($strurl, $url->out(false));
$strurl = 'http://moodle.org/course/view.php?id';
- $url = new moodle_url($strurl, array('id' => ''));
+ $url = new \moodle_url($strurl, array('id' => ''));
$this->assertSame($strurl, $url->out(false));
$strurl = 'http://moodle.org/course/view.php?id';
- $url = new moodle_url($strurl);
+ $url = new \moodle_url($strurl);
$this->assertSame($strurl, $url->out(false));
}
@@ -114,7 +107,7 @@ class core_moodle_url_testcase extends advanced_testcase {
* Test set good scheme on Moodle URL objects.
*/
public function test_moodle_url_set_good_scheme() {
- $url = new moodle_url('http://moodle.org/foo/bar');
+ $url = new \moodle_url('http://moodle.org/foo/bar');
$url->set_scheme('myscheme');
$this->assertSame('myscheme://moodle.org/foo/bar', $url->out());
}
@@ -123,46 +116,46 @@ class core_moodle_url_testcase extends advanced_testcase {
* Test set bad scheme on Moodle URL objects.
*/
public function test_moodle_url_set_bad_scheme() {
- $url = new moodle_url('http://moodle.org/foo/bar');
- $this->expectException(coding_exception::class);
+ $url = new \moodle_url('http://moodle.org/foo/bar');
+ $this->expectException(\coding_exception::class);
$url->set_scheme('not a valid $ scheme');
}
public function test_moodle_url_round_trip_array_params() {
$strurl = 'http://example.com/?a%5B1%5D=1&a%5B2%5D=2';
- $url = new moodle_url($strurl);
+ $url = new \moodle_url($strurl);
$this->assertSame($strurl, $url->out(false));
- $url = new moodle_url('http://example.com/?a[1]=1&a[2]=2');
+ $url = new \moodle_url('http://example.com/?a[1]=1&a[2]=2');
$this->assertSame($strurl, $url->out(false));
// For un-keyed array params, we expect 0..n keys to be returned.
$strurl = 'http://example.com/?a%5B0%5D=0&a%5B1%5D=1';
- $url = new moodle_url('http://example.com/?a[]=0&a[]=1');
+ $url = new \moodle_url('http://example.com/?a[]=0&a[]=1');
$this->assertSame($strurl, $url->out(false));
}
public function test_compare_url() {
- $url1 = new moodle_url('index.php', array('var1' => 1, 'var2' => 2));
- $url2 = new moodle_url('index2.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
+ $url1 = new \moodle_url('index.php', array('var1' => 1, 'var2' => 2));
+ $url2 = new \moodle_url('index2.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
$this->assertFalse($url1->compare($url2, URL_MATCH_BASE));
$this->assertFalse($url1->compare($url2, URL_MATCH_PARAMS));
$this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
- $url2 = new moodle_url('index.php', array('var1' => 1, 'var3' => 3));
+ $url2 = new \moodle_url('index.php', array('var1' => 1, 'var3' => 3));
$this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
$this->assertFalse($url1->compare($url2, URL_MATCH_PARAMS));
$this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
- $url2 = new moodle_url('index.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
+ $url2 = new \moodle_url('index.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
$this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
$this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
$this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
- $url2 = new moodle_url('index.php', array('var2' => 2, 'var1' => 1));
+ $url2 = new \moodle_url('index.php', array('var2' => 2, 'var1' => 1));
$this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
$this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
@@ -182,26 +175,26 @@ class core_moodle_url_testcase extends advanced_testcase {
public function test_out_as_local_url() {
global $CFG;
// Test http url.
- $url1 = new moodle_url('/lib/tests/weblib_test.php');
+ $url1 = new \moodle_url('/lib/tests/weblib_test.php');
$this->assertSame('/lib/tests/weblib_test.php', $url1->out_as_local_url());
// Test https url.
$httpswwwroot = str_replace("http://", "https://", $CFG->wwwroot);
- $url2 = new moodle_url($httpswwwroot.'/login/profile.php');
+ $url2 = new \moodle_url($httpswwwroot.'/login/profile.php');
$this->assertSame('/login/profile.php', $url2->out_as_local_url());
// Test http url matching wwwroot.
- $url3 = new moodle_url($CFG->wwwroot);
+ $url3 = new \moodle_url($CFG->wwwroot);
$this->assertSame('', $url3->out_as_local_url());
// Test http url matching wwwroot ending with slash (/).
- $url3 = new moodle_url($CFG->wwwroot.'/');
+ $url3 = new \moodle_url($CFG->wwwroot.'/');
$this->assertSame('/', $url3->out_as_local_url());
}
public function test_out_as_local_url_error() {
- $url2 = new moodle_url('http://www.google.com/lib/tests/weblib_test.php');
- $this->expectException(coding_exception::class);
+ $url2 = new \moodle_url('http://www.google.com/lib/tests/weblib_test.php');
+ $this->expectException(\coding_exception::class);
$url2->out_as_local_url();
}
@@ -212,8 +205,8 @@ class core_moodle_url_testcase extends advanced_testcase {
global $CFG;
$modifiedurl = $CFG->wwwroot.'1';
- $url3 = new moodle_url($modifiedurl.'/login/profile.php');
- $this->expectException(coding_exception::class);
+ $url3 = new \moodle_url($modifiedurl.'/login/profile.php');
+ $this->expectException(\coding_exception::class);
$url3->out_as_local_url();
}
@@ -221,38 +214,38 @@ class core_moodle_url_testcase extends advanced_testcase {
* Try get local url from external https url and you should get error
*/
public function test_https_out_as_local_url_error() {
- $url4 = new moodle_url('https://www.google.com/lib/tests/weblib_test.php');
- $this->expectException(coding_exception::class);
+ $url4 = new \moodle_url('https://www.google.com/lib/tests/weblib_test.php');
+ $this->expectException(\coding_exception::class);
$url4->out_as_local_url();
}
public function test_moodle_url_get_scheme() {
// Should return the scheme only.
- $url = new moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+ $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
$this->assertSame('http', $url->get_scheme());
// Should work for secure URLs.
- $url = new moodle_url('https://www.example.org:447/my/file/is/here.txt?really=1');
+ $url = new \moodle_url('https://www.example.org:447/my/file/is/here.txt?really=1');
$this->assertSame('https', $url->get_scheme());
// Should return an empty string if no scheme is specified.
- $url = new moodle_url('www.example.org:447/my/file/is/here.txt?really=1');
+ $url = new \moodle_url('www.example.org:447/my/file/is/here.txt?really=1');
$this->assertSame('', $url->get_scheme());
}
public function test_moodle_url_get_host() {
// Should return the host part only.
- $url = new moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+ $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
$this->assertSame('www.example.org', $url->get_host());
}
public function test_moodle_url_get_port() {
// Should return the port if one provided.
- $url = new moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+ $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
$this->assertSame(447, $url->get_port());
// Should return an empty string if port not specified.
- $url = new moodle_url('http://www.example.org/some/path/here.php');
+ $url = new \moodle_url('http://www.example.org/some/path/here.php');
$this->assertSame('', $url->get_port());
}
@@ -270,7 +263,7 @@ class core_moodle_url_testcase extends advanced_testcase {
$this->resetAfterTest();
$CFG->slasharguments = $slashargs;
- $url = call_user_func_array('moodle_url::make_pluginfile_url', $args);
+ $url = call_user_func_array('\moodle_url::make_pluginfile_url', $args);
$this->assertMatchesRegularExpression($expected, $url->out(true));
}
diff --git a/lib/tests/myprofilelib_test.php b/lib/tests/myprofilelib_test.php
index 47cab7d4c37..f7f8e96551b 100644
--- a/lib/tests/myprofilelib_test.php
+++ b/lib/tests/myprofilelib_test.php
@@ -14,13 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Tests for myprofilelib apis.
- *
- * @package core
- * @copyright 2015 onwards Ankit agarwal
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +28,7 @@ require_once($CFG->dirroot . '/lib/myprofilelib.php');
* @copyright 2015 onwards Ankit agarwal
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
*/
-class core_myprofilelib_testcase extends advanced_testcase {
+class myprofilelib_test extends \advanced_testcase {
/**
* @var stdClass The user.
@@ -72,7 +66,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
// Test tree as admin user.
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, $this->course);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$categories = $reflector->getProperty('categories');
$categories->setAccessible(true);
$cats = $categories->getValue($this->tree);
@@ -97,7 +91,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = false;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, $this->course);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayNotHasKey('fullprofile', $nodes->getValue($this->tree));
@@ -111,7 +105,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = true;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, $this->course);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayHasKey('editprofile', $nodes->getValue($this->tree));
@@ -125,7 +119,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = false;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, $this->course);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayHasKey('editprofile', $nodes->getValue($this->tree));
@@ -139,7 +133,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = false;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, $this->course);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayHasKey('preferences', $nodes->getValue($this->tree));
@@ -156,7 +150,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = false;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, $this->course);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayNotHasKey('loginas', $nodes->getValue($this->tree));
@@ -194,7 +188,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
// User with proper permissions.
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, null);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
foreach ($hiddenfields as $field) {
@@ -219,7 +213,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
// User without permission.
$this->setUser($this->user2);
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, null);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
foreach ($hiddenfields as $field) {
@@ -240,7 +234,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = false;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, null);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayHasKey('firstaccess', $nodes->getValue($this->tree));
@@ -259,7 +253,7 @@ class core_myprofilelib_testcase extends advanced_testcase {
$iscurrentuser = false;
core_myprofile_navigation($this->tree, $this->user, $iscurrentuser, null);
- $reflector = new ReflectionObject($this->tree);
+ $reflector = new \ReflectionObject($this->tree);
$nodes = $reflector->getProperty('nodes');
$nodes->setAccessible(true);
$this->assertArrayNotHasKey('firstaccess', $nodes->getValue($this->tree));
diff --git a/lib/tests/navigationlib_test.php b/lib/tests/navigationlib_test.php
index 0848ee8effa..364d73d5a06 100644
--- a/lib/tests/navigationlib_test.php
+++ b/lib/tests/navigationlib_test.php
@@ -18,18 +18,37 @@
* Unit tests for lib/navigationlib.php
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2009 Sam Hemelryk
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later (5)
*/
+namespace core;
+
+use action_link;
+use global_navigation;
+use navbar;
+use navigation_cache;
+use navigation_node;
+use navigation_node_collection;
+use pix_icon;
+use popup_action;
+use settings_navigation;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->libdir . '/navigationlib.php');
-
-class core_navigationlib_testcase extends advanced_testcase {
+/**
+ * Unit tests for lib/navigationlib.php
+ *
+ * @package core
+ * @category test
+ * @copyright 2009 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later (5)
+ */
+class navigationlib_test extends \advanced_testcase {
/**
* @var navigation_node
*/
@@ -42,7 +61,7 @@ class core_navigationlib_testcase extends advanced_testcase {
$PAGE->set_course($SITE);
$activeurl = $PAGE->url;
- $inactiveurl = new moodle_url('http://www.moodle.com/');
+ $inactiveurl = new \moodle_url('http://www.moodle.com/');
navigation_node::override_active_url($PAGE->url);
@@ -71,7 +90,7 @@ class core_navigationlib_testcase extends advanced_testcase {
'shorttext' => 'A very silly extra long short text string, more than 25 characters',
'key' => 'key',
'type' => 'navigation_node::TYPE_COURSE',
- 'action' => new moodle_url('http://www.moodle.org/'));
+ 'action' => new \moodle_url('http://www.moodle.org/'));
$node = new navigation_node($fakeproperties);
$this->assertSame($fakeproperties['text'], $node->text);
@@ -252,7 +271,7 @@ class core_navigationlib_testcase extends advanced_testcase {
$this->setup_node();
$node1 = $this->node->add('active node 1', null, navigation_node::TYPE_CUSTOM, null, 'anode1');
- $node2 = $this->node->add('active node 2', new moodle_url($CFG->wwwroot), navigation_node::TYPE_COURSE, null, 'anode2');
+ $node2 = $this->node->add('active node 2', new \moodle_url($CFG->wwwroot), navigation_node::TYPE_COURSE, null, 'anode2');
$node1->make_active();
$this->node->get('anode2')->make_active();
$this->assertTrue($node1->isactive);
@@ -345,9 +364,9 @@ class core_navigationlib_testcase extends advanced_testcase {
$cat2 = $generator->create_category(array('parent' => $cat1->id));
$course = $generator->create_course(array('category' => $cat2->id));
- $page = new moodle_page();
+ $page = new \moodle_page();
$page->set_course($course);
- $page->set_url(new moodle_url('/course/view.php', array('id' => $course->id)));
+ $page->set_url(new \moodle_url('/course/view.php', array('id' => $course->id)));
$page->navbar->prepend('test 1');
$page->navbar->prepend('test 2');
$page->navbar->add('test 3');
@@ -376,7 +395,7 @@ class core_navigationlib_testcase extends advanced_testcase {
* @depends test_navbar_prepend_and_add
* @param $node
*/
- public function test_navbar_has_items(moodle_page $page) {
+ public function test_navbar_has_items(\moodle_page $page) {
$this->resetAfterTest();
$this->assertTrue($page->navbar->has_items());
@@ -554,7 +573,7 @@ class core_navigationlib_testcase extends advanced_testcase {
*/
class exposed_global_navigation extends global_navigation {
protected $exposedkey = 'exposed_';
- public function __construct(moodle_page $page=null) {
+ public function __construct(\moodle_page $page=null) {
global $PAGE;
if ($page === null) {
$page = $PAGE;
@@ -569,7 +588,7 @@ class exposed_global_navigation extends global_navigation {
if (method_exists($this, $method)) {
return call_user_func_array(array($this, $method), $arguments);
}
- throw new coding_exception('You have attempted to access a method that does not exist for the given object '.$method, DEBUG_DEVELOPER);
+ throw new \coding_exception('You have attempted to access a method that does not exist for the given object '.$method, DEBUG_DEVELOPER);
}
public function set_initialised() {
$this->initialised = true;
@@ -612,7 +631,7 @@ class mock_initialise_global_navigation extends global_navigation {
*/
class exposed_navbar extends navbar {
protected $exposedkey = 'exposed_';
- public function __construct(moodle_page $page) {
+ public function __construct(\moodle_page $page) {
parent::__construct($page);
$this->cache = new navigation_cache('unittest_nav');
}
@@ -623,11 +642,11 @@ class exposed_navbar extends navbar {
if (method_exists($this, $method)) {
return call_user_func_array(array($this, $method), $arguments);
}
- throw new coding_exception('You have attempted to access a method that does not exist for the given object '.$method, DEBUG_DEVELOPER);
+ throw new \coding_exception('You have attempted to access a method that does not exist for the given object '.$method, DEBUG_DEVELOPER);
}
}
-class navigation_exposed_moodle_page extends moodle_page {
+class navigation_exposed_moodle_page extends \moodle_page {
public function set_navigation(navigation_node $node) {
$this->_navigation = $node;
}
@@ -651,6 +670,6 @@ class exposed_settings_navigation extends settings_navigation {
if (method_exists($this, $method)) {
return call_user_func_array(array($this, $method), $arguments);
}
- throw new coding_exception('You have attempted to access a method that does not exist for the given object '.$method, DEBUG_DEVELOPER);
+ throw new \coding_exception('You have attempted to access a method that does not exist for the given object '.$method, DEBUG_DEVELOPER);
}
}
diff --git a/lib/tests/notification_test.php b/lib/tests/notification_test.php
index 33078fe8d37..8e4a75af7c7 100644
--- a/lib/tests/notification_test.php
+++ b/lib/tests/notification_test.php
@@ -14,39 +14,29 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for core\notification.
- *
- * @package core
- * @category phpunit
- * @copyright 2016 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
+namespace core;
/**
* Unit tests for core\notification.
*
* @package core
- * @category phpunit
- * @category phpunit
+ * @category test
* @copyright 2016 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_notification_testcase extends advanced_testcase {
+class notification_test extends \advanced_testcase {
/**
* Setup required for all notification tests.
*
* This includes emptying the list of notifications on the session, resetting any session which exists, and setting
- * up a new moodle_page object.
+ * up a new \moodle_page object.
*/
public function setUp(): void {
global $PAGE, $SESSION;
parent::setUp();
- $PAGE = new moodle_page();
+ $PAGE = new \moodle_page();
\core\session\manager::init_empty_session();
$SESSION->notifications = [];
}
@@ -55,7 +45,7 @@ class core_notification_testcase extends advanced_testcase {
* Tear down required for all notification tests.
*
* This includes emptying the list of notifications on the session, resetting any session which exists, and setting
- * up a new moodle_page object.
+ * up a new \moodle_page object.
*/
public function tearDown(): void {
global $PAGE, $SESSION;
diff --git a/lib/tests/output_mustache_helper_collection_test.php b/lib/tests/output/mustache_helper_collection_test.php
similarity index 97%
rename from lib/tests/output_mustache_helper_collection_test.php
rename to lib/tests/output/mustache_helper_collection_test.php
index 52e39764dfa..c32dc5aba94 100644
--- a/lib/tests/output_mustache_helper_collection_test.php
+++ b/lib/tests/output/mustache_helper_collection_test.php
@@ -14,21 +14,16 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for lib/classes/output/mustache_helper_collection
- *
- * @copyright 2019 Ryan Wyllie
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-use core\output\mustache_helper_collection;
+namespace core\output;
/**
* Unit tests for the mustache_helper_collection class.
+ *
+ * @package core
+ * @copyright 2019 Ryan Wyllie
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_output_mustache_helper_collection_testcase extends advanced_testcase {
+class mustache_helper_collection_test extends \advanced_testcase {
/**
* Test cases to confirm that disallowed helpers are stripped from the source
* text by the helper before being passed to other another helper. This prevents
diff --git a/lib/tests/mustache_template_finder_test.php b/lib/tests/output/mustache_template_finder_test.php
similarity index 95%
rename from lib/tests/mustache_template_finder_test.php
rename to lib/tests/output/mustache_template_finder_test.php
index 4c5fadf2f14..ce270719439 100644
--- a/lib/tests/mustache_template_finder_test.php
+++ b/lib/tests/output/mustache_template_finder_test.php
@@ -14,24 +14,20 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core\output;
+
/**
* Unit tests for lib/classes/output/mustache_template_finder.php
*
+ * Unit tests for the Mustache template finder class (contains logic about
+ * resolving mustache template locations.
+ *
* @package core
- * @category phpunit
+ * @category test
* @copyright 2015 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-use core\output\mustache_template_finder;
-
-/**
- * Unit tests for the Mustache template finder class (contains logic about
- * resolving mustache template locations.
- */
-class core_output_mustache_template_finder_testcase extends advanced_testcase {
+class mustache_template_finder_test extends \advanced_testcase {
/**
* Data provider which reutrns a set of valid template directories to be used when testing
@@ -105,7 +101,7 @@ class core_output_mustache_template_finder_testcase extends advanced_testcase {
*/
public function test_invalid_component_get_template_directories_for_component() {
// Test something invalid.
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
mustache_template_finder::get_template_directories_for_component('octopus', 'classic');
}
@@ -192,7 +188,7 @@ class core_output_mustache_template_finder_testcase extends advanced_testcase {
* Tests for get_template_filepath when dealing with an invalid component.
*/
public function test_invalid_component_get_template_filepath() {
- $this->expectException(moodle_exception::class);
+ $this->expectException(\moodle_exception::class);
mustache_template_finder::get_template_filepath('core/octopus', 'classic');
}
}
diff --git a/lib/tests/mustache_template_source_loader_test.php b/lib/tests/output/mustache_template_source_loader_test.php
similarity index 97%
rename from lib/tests/mustache_template_source_loader_test.php
rename to lib/tests/output/mustache_template_source_loader_test.php
index a0e30db7b16..a4f177e8b43 100644
--- a/lib/tests/mustache_template_source_loader_test.php
+++ b/lib/tests/output/mustache_template_source_loader_test.php
@@ -14,26 +14,18 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core\output;
+
/**
+ * Unit tests for the Mustache source loader class.
+ *
* Unit tests for lib/classes/output/mustache_template_source_loader.php
*
* @package core
* @copyright 2018 Ryan Wyllie
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-use core\output\mustache_template_source_loader;
-
-/**
- * Unit tests for the Mustache source loader class.
- *
- * @package core
- * @copyright 2018 Ryan Wyllie
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_output_mustache_template_source_loader_testcase extends advanced_testcase {
+class mustache_template_source_loader_test extends \advanced_testcase {
/**
* Ensure that stripping comments from templates does not mutilate the template body.
*/
@@ -130,7 +122,7 @@ TBD;
TBC;
$loader = new mustache_template_source_loader();
- $actual = phpunit_util::call_internal_method(
+ $actual = \phpunit_util::call_internal_method(
$loader,
'strip_template_comments',
[$templatewithcomment],
@@ -502,7 +494,7 @@ TEMPLATE;
* @param string $expected The expected output
*/
public function test_scan_template_source_for_dependencies($loader, $source, $expected) {
- $actual = phpunit_util::call_internal_method(
+ $actual = \phpunit_util::call_internal_method(
$loader,
'scan_template_source_for_dependencies',
[$source],
diff --git a/lib/tests/outputcomponents_test.php b/lib/tests/outputcomponents_test.php
index a99830a2221..caacd08bd36 100644
--- a/lib/tests/outputcomponents_test.php
+++ b/lib/tests/outputcomponents_test.php
@@ -14,14 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for lib/outputcomponents.php.
- *
- * @package core
- * @category phpunit
- * @copyright 2011 David Mudrak
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use block_contents;
+use custom_menu;
+use custom_menu_item;
+use paging_bar;
+use renderer_base;
+use single_select;
+use theme_config;
+use url_select;
+use user_picture;
defined('MOODLE_INTERNAL') || die();
@@ -29,9 +32,14 @@ global $CFG;
require_once($CFG->libdir . '/outputcomponents.php');
/**
- * Unit tests for the user_picture class.
+ * Unit tests for lib/outputcomponents.php.
+ *
+ * @package core
+ * @category test
+ * @copyright 2011 David Mudrak
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_outputcomponents_testcase extends advanced_testcase {
+class outputcomponents_test extends \advanced_testcase {
/**
* Tests user_picture::fields.
@@ -77,7 +85,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
$fields = implode(',', \core_user\fields::get_picture_fields());
$fields = array_map('trim', explode(',', $fields));
- $fakerecord = new stdClass();
+ $fakerecord = new \stdClass();
$fakerecord->aliasedid = 42;
foreach ($fields as $field) {
if ($field !== 'id') {
@@ -104,7 +112,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
$fields = implode(',', \core_user\fields::get_picture_fields());
$fields = array_map('trim', explode(',', $fields));
- $fakerecord = new stdClass();
+ $fakerecord = new \stdClass();
$fakerecord->aliasedid = 42;
foreach ($fields as $field) {
if ($field !== 'id') {
@@ -144,25 +152,25 @@ class core_outputcomponents_testcase extends advanced_testcase {
$this->assertSame('mm', $CFG->gravatardefaulturl);
// Create some users.
- $page = new moodle_page();
+ $page = new \moodle_page();
$page->set_url('/user/profile.php');
- $page->set_context(context_system::instance());
+ $page->set_context(\context_system::instance());
$renderer = $page->get_renderer('core');
$user1 = $this->getDataGenerator()->create_user(array('picture'=>11, 'email'=>'user1@example.com'));
- $context1 = context_user::instance($user1->id);
+ $context1 = \context_user::instance($user1->id);
$user2 = $this->getDataGenerator()->create_user(array('picture'=>0, 'email'=>'user2@example.com'));
- $context2 = context_user::instance($user2->id);
+ $context2 = \context_user::instance($user2->id);
// User 3 is deleted.
$user3 = $this->getDataGenerator()->create_user(array('picture'=>1, 'deleted'=>1, 'email'=>'user3@example.com'));
- $this->assertNotEmpty(context_user::instance($user3->id));
+ $this->assertNotEmpty(\context_user::instance($user3->id));
$this->assertEquals(0, $user3->picture);
$this->assertNotEquals('user3@example.com', $user3->email);
// User 4 is incorrectly deleted with its context deleted as well (testing legacy code).
$user4 = $this->getDataGenerator()->create_user(['picture' => 1, 'deleted' => 1, 'email' => 'user4@example.com']);
- context_helper::delete_instance(CONTEXT_USER, $user4->id);
+ \context_helper::delete_instance(CONTEXT_USER, $user4->id);
$this->assertEquals(0, $user4->picture);
$this->assertNotEquals('user4@example.com', $user4->email);
@@ -173,7 +181,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
$user1->picture = 11;
// Try valid user with picture when user context is not cached - 1 query expected.
- context_helper::reset_caches();
+ \context_helper::reset_caches();
$reads = $DB->perf_get_reads();
$up1 = new user_picture($user1);
$this->assertEquals($reads, $DB->perf_get_reads());
@@ -182,7 +190,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
// Try valid user with contextid hint - no queries expected.
$user1->contextid = $context1->id;
- context_helper::reset_caches();
+ \context_helper::reset_caches();
$reads = $DB->perf_get_reads();
$up1 = new user_picture($user1);
$this->assertEquals($reads, $DB->perf_get_reads());
@@ -190,7 +198,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
$this->assertEquals($reads, $DB->perf_get_reads());
// Try valid user without image - no queries expected.
- context_helper::reset_caches();
+ \context_helper::reset_caches();
$reads = $DB->perf_get_reads();
$up2 = new user_picture($user2);
$this->assertEquals($reads, $DB->perf_get_reads());
@@ -199,7 +207,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
// Try guessing of deleted users - no queries expected.
unset($user3->deleted);
- context_helper::reset_caches();
+ \context_helper::reset_caches();
$reads = $DB->perf_get_reads();
$up3 = new user_picture($user3);
$this->assertEquals($reads, $DB->perf_get_reads());
@@ -275,9 +283,9 @@ class core_outputcomponents_testcase extends advanced_testcase {
// Now test gravatar with one theme having own images (afterburner).
// $this->assertFileExists("$CFG->dirroot/theme/afterburner/config.php");
// set_config('theme', 'afterburner');
- // $page = new moodle_page();
+ // $page = new \moodle_page();
// $page->set_url('/user/profile.php');
- // $page->set_context(context_system::instance());
+ // $page->set_context(\context_system::instance());
// $renderer = $page->get_renderer('core');
// $up2 = new user_picture($user2);
@@ -291,9 +299,9 @@ class core_outputcomponents_testcase extends advanced_testcase {
// set_config('enablegravatar', 0);
// $this->assertFileExists("$CFG->dirroot/theme/formal_white/config.php"); // Use any other theme.
// set_config('theme', 'formal_white');
- // $page = new moodle_page();
+ // $page = new \moodle_page();
// $page->set_url('/user/profile.php');
- // $page->set_context(context_system::instance());
+ // $page->set_context(\context_system::instance());
// $renderer = $page->get_renderer('core');
// $up1 = new user_picture($user1);
@@ -306,9 +314,9 @@ class core_outputcomponents_testcase extends advanced_testcase {
set_config('theme', 'classic');
$CFG->wwwroot = str_replace('https:', 'http:', $CFG->wwwroot);
$CFG->slasharguments = 0;
- $page = new moodle_page();
+ $page = new \moodle_page();
$page->set_url('/user/profile.php');
- $page->set_context(context_system::instance());
+ $page->set_context(\context_system::instance());
$renderer = $page->get_renderer('core');
$up3 = new user_picture($user3);
@@ -317,7 +325,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
public function test_empty_menu() {
$emptymenu = new custom_menu();
- $this->assertInstanceOf('custom_menu', $emptymenu);
+ $this->assertInstanceOf(custom_menu::class, $emptymenu);
$this->assertFalse($emptymenu->has_children());
}
@@ -347,7 +355,7 @@ EOF;
$this->assertCount(3, $item->get_children());
$this->assertEquals('Moodle community', $item->get_text());
$itemurl = $item->get_url();
- $this->assertTrue($itemurl instanceof moodle_url);
+ $this->assertTrue($itemurl instanceof \moodle_url);
$this->assertEquals('http://moodle.org', $itemurl->out());
$this->assertNull($item->get_title()); // Implicit title.
@@ -460,7 +468,7 @@ EOF;
'8',
);
- $mpage = new moodle_page();
+ $mpage = new \moodle_page();
$rbase = new renderer_base($mpage, "/");
$pbara = new paging_bar(40, 0, 5, 'index.php');
$pbara->prepare($rbase, $mpage, "/");
@@ -475,7 +483,7 @@ EOF;
public function test_pix_icon() {
$this->resetAfterTest();
- $page = new moodle_page();
+ $page = new \moodle_page();
set_config('theme', 'boost');
// Need to reset after changing theme.
@@ -543,7 +551,7 @@ EOF;
$options = [ "Option A", "Option B", "Option C" ];
$nothing = ['' => 'choosedots'];
- $url = new moodle_url('/');
+ $url = new \moodle_url('/');
$singleselect = new single_select($url, $realname, $options, null, $nothing, 'someformid');
$singleselect->class = $realclass;
@@ -619,9 +627,9 @@ EOF;
'style' => $labelstyle
];
- $url1 = new moodle_url("/#a");
- $url2 = new moodle_url("/#b");
- $url3 = new moodle_url("/#c");
+ $url1 = new \moodle_url("/#a");
+ $url2 = new \moodle_url("/#b");
+ $url3 = new \moodle_url("/#c");
$urls = [
$url1->out() => 'A',
diff --git a/lib/tests/outputfactories_test.php b/lib/tests/outputfactories_test.php
index c69d13fbe68..63edd17f790 100644
--- a/lib/tests/outputfactories_test.php
+++ b/lib/tests/outputfactories_test.php
@@ -14,14 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for lib/outputfactories.php.
- *
- * @package core
- * @category phpunit
- * @copyright 2014 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use test_output_factory;
defined('MOODLE_INTERNAL') || die();
@@ -30,9 +25,14 @@ require_once($CFG->libdir . '/outputfactories.php');
require_once($CFG->libdir . '/tests/fixtures/test_renderer_factory.php');
/**
- * Unit tests for the user_picture class.
+ * Unit tests for lib/outputfactories.php.
+ *
+ * @package core
+ * @category test
+ * @copyright 2014 Damyon Wiese
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_outputfactories_testcase extends advanced_testcase {
+class outputfactories_test extends \advanced_testcase {
public function test_nonautoloaded_classnames() {
global $PAGE;
diff --git a/lib/tests/outputrequirementslib_test.php b/lib/tests/outputrequirementslib_test.php
index b0ca1c3da10..a3e32a66b1d 100644
--- a/lib/tests/outputrequirementslib_test.php
+++ b/lib/tests/outputrequirementslib_test.php
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for lib/outputrequirementslibphp.
- *
- * @package core
- * @category phpunit
- * @copyright 2012 Petr Škoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
@@ -29,11 +22,19 @@ global $CFG;
require_once($CFG->libdir . '/outputrequirementslib.php');
-class core_outputrequirementslib_testcase extends advanced_testcase {
+/**
+ * Unit tests for lib/outputrequirementslibphp.
+ *
+ * @package core
+ * @category test
+ * @copyright 2012 Petr Škoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class outputrequirementslib_test extends \advanced_testcase {
public function test_string_for_js() {
$this->resetAfterTest();
- $page = new moodle_page();
+ $page = new \moodle_page();
$page->requires->string_for_js('course', 'moodle', 1);
$page->requires->string_for_js('course', 'moodle', 1);
$this->expectException('coding_exception');
@@ -44,21 +45,21 @@ class core_outputrequirementslib_testcase extends advanced_testcase {
}
public function test_one_time_output_normal_case() {
- $page = new moodle_page();
+ $page = new \moodle_page();
$this->assertTrue($page->requires->should_create_one_time_item_now('test_item'));
$this->assertFalse($page->requires->should_create_one_time_item_now('test_item'));
}
public function test_one_time_output_repeat_output_throws() {
- $page = new moodle_page();
+ $page = new \moodle_page();
$page->requires->set_one_time_item_created('test_item');
$this->expectException('coding_exception');
$page->requires->set_one_time_item_created('test_item');
}
public function test_one_time_output_different_pages_independent() {
- $firstpage = new moodle_page();
- $secondpage = new moodle_page();
+ $firstpage = new \moodle_page();
+ $secondpage = new \moodle_page();
$this->assertTrue($firstpage->requires->should_create_one_time_item_now('test_item'));
$this->assertTrue($secondpage->requires->should_create_one_time_item_now('test_item'));
}
@@ -76,7 +77,7 @@ class core_outputrequirementslib_testcase extends advanced_testcase {
// With slasharguments on.
$CFG->slasharguments = 1;
- $page = new moodle_page();
+ $page = new \moodle_page();
$requirements = $page->requires;
// Assert successful method call.
$this->assertTrue($requirements->jquery_plugin('jquery'));
@@ -91,7 +92,7 @@ class core_outputrequirementslib_testcase extends advanced_testcase {
// With slasharguments off.
$CFG->slasharguments = 0;
- $page = new moodle_page();
+ $page = new \moodle_page();
$requirements = $page->requires;
// Assert successful method call.
$this->assertTrue($requirements->jquery_plugin('jquery'));
@@ -108,7 +109,7 @@ class core_outputrequirementslib_testcase extends advanced_testcase {
*/
public function test_js_call_amd() {
- $page = new moodle_page();
+ $page = new \moodle_page();
// Load an AMD module without a function call.
$page->requires->js_call_amd('theme_foobar/lightbox');
diff --git a/lib/tests/pdflib_test.php b/lib/tests/pdflib_test.php
index e9a68f8a3e3..fb8cf0777ff 100644
--- a/lib/tests/pdflib_test.php
+++ b/lib/tests/pdflib_test.php
@@ -14,15 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Tests for PDFlib
- *
- * @package core
- * @copyright 2021 Brendan Heywood (brendan@catalyst-au.net)
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
-defined('MOODLE_INTERNAL') || die();
+use TCPDF_STATIC;
/**
* Tests for PDFlib
@@ -31,7 +25,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2021 Brendan Heywood (brendan@catalyst-au.net)
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_pdflib_testcase extends advanced_testcase {
+class pdflib_test extends \advanced_testcase {
public function test_gettcpdf_producer() {
global $CFG;
diff --git a/lib/tests/plugin_manager_test.php b/lib/tests/plugin_manager_test.php
index c62e180d99a..8eba35750ea 100644
--- a/lib/tests/plugin_manager_test.php
+++ b/lib/tests/plugin_manager_test.php
@@ -14,14 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for plugin 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
- */
+namespace core;
+
+use core_plugin_manager;
+use testable_core_plugin_manager;
+use testable_plugininfo_base;
defined('MOODLE_INTERNAL') || die();
@@ -30,9 +27,14 @@ require_once($CFG->dirroot.'/lib/tests/fixtures/testable_plugin_manager.php');
require_once($CFG->dirroot.'/lib/tests/fixtures/testable_plugininfo_base.php');
/**
- * Tests of the basic API of the plugin manager.
+ * Unit tests for plugin manager class.
+ *
+ * @package core
+ * @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_plugin_manager_testcase extends advanced_testcase {
+class plugin_manager_test extends \advanced_testcase {
public function tearDown(): void {
// The caches of the testable singleton must be reset explicitly. It is
@@ -376,7 +378,7 @@ class core_plugin_manager_testcase extends advanced_testcase {
*/
public function test_get_remote_plugin_info_exception() {
$pluginman = testable_core_plugin_manager::instance();
- $this->expectException(moodle_exception::class);
+ $this->expectException(\moodle_exception::class);
$pluginman->get_remote_plugin_info('any_thing', ANY_VERSION, true);
}
diff --git a/lib/tests/qrcode_test.php b/lib/tests/qrcode_test.php
index c91501aef36..7e2830482a9 100644
--- a/lib/tests/qrcode_test.php
+++ b/lib/tests/qrcode_test.php
@@ -14,16 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Test QR code functionality.
- *
- * @package core
- * @copyright Moodle Pty Ltd
- * @author
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
-defined('MOODLE_INTERNAL') || die();
+use core_qrcode;
/**
* A set of tests for some of the QR code functionality within Moodle.
@@ -33,7 +26,7 @@ defined('MOODLE_INTERNAL') || die();
* @author
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_qrcode_testcase extends basic_testcase {
+class qrcode_test extends \basic_testcase {
/**
* Basic test to generate a QR code and check that the library is not broken.
diff --git a/lib/tests/regex_test.php b/lib/tests/regex_test.php
index c8dd97eb631..450a6754076 100644
--- a/lib/tests/regex_test.php
+++ b/lib/tests/regex_test.php
@@ -14,16 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Test PHP regex capability - this may also serve as an example for devs.
- *
- * @package core
- * @copyright 2015 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @author Petr Skoda
- */
-
-defined('MOODLE_INTERNAL') || die();
+namespace core;
/**
* Test PHP regex capability - this may also serve as an example for devs.
@@ -33,7 +24,7 @@ defined('MOODLE_INTERNAL') || die();
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @author Petr Skoda
*/
-class core_regex_testcase extends advanced_testcase {
+class regex_test extends \advanced_testcase {
public function test_whitespace_replacement_with_u() {
$unicode = "Теорія і практика використання системи управління навчанням Moo
dleКиївський національний університет будівництва і архітектури, 21-22 тра
diff --git a/lib/tests/requirejs_test.php b/lib/tests/requirejs_test.php
index e53ee783e21..6c22e1f60d2 100644
--- a/lib/tests/requirejs_test.php
+++ b/lib/tests/requirejs_test.php
@@ -14,16 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for requirejs loader.
- *
- * @package core
- * @author Damyon Wiese
- * @copyright 2016 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
-defined('MOODLE_INTERNAL') || die();
+use core_requirejs;
/**
* Unit tests for requirejs.
@@ -33,7 +26,7 @@ defined('MOODLE_INTERNAL') || die();
* @copyright 2016 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_requirejs_testcase extends advanced_testcase {
+class requirejs_test extends \advanced_testcase {
/**
* Test requirejs loader
@@ -66,7 +59,7 @@ class core_requirejs_testcase extends advanced_testcase {
// Lets verify the first part of the key is a valid component name and the second part correctly contains "min" or not.
list($component, $template) = explode('/', $key, 2);
// Can we resolve it to a valid dir?
- $dir = core_component::get_component_directory($component);
+ $dir = \core_component::get_component_directory($component);
$this->assertNotEmpty($dir);
// Only "core" is allowed to have no _ in component names.
@@ -81,7 +74,7 @@ class core_requirejs_testcase extends advanced_testcase {
foreach ($result as $key => $path) {
// Lets verify the first part of the key is a valid component name and the second part correctly contains "min" or not.
list($component, $template) = explode('/', $key, 2);
- $dir = core_component::get_component_directory($component);
+ $dir = \core_component::get_component_directory($component);
$this->assertNotEmpty($dir);
// Only "core" is allowed to have no _ in component names.
if (strpos($component, '_') === false) {
diff --git a/lib/tests/session_manager_test.php b/lib/tests/session_manager_test.php
index 968dafb9d42..1d13d0fc5fb 100644
--- a/lib/tests/session_manager_test.php
+++ b/lib/tests/session_manager_test.php
@@ -14,26 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * 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);
diff --git a/lib/tests/session_redis_test.php b/lib/tests/session_redis_test.php
index dab879f696c..68c2fb4ed0b 100644
--- a/lib/tests/session_redis_test.php
+++ b/lib/tests/session_redis_test.php
@@ -14,8 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
+use Redis;
+use RedisException;
+
/**
- * Redis session tests.
+ * Unit tests for classes/session/redis.php.
*
* NOTE: in order to execute this test you need to set up
* Redis server and add configuration a constant
@@ -26,21 +31,10 @@
* @package core
* @author Russell Smith
* @copyright 2016 Russell Smith
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Unit tests for classes/session/redis.php.
- *
- * @package core
- * @author Russell Smith
- * @copyright 2016 Russell Smith
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @runClassInSeparateProcess
*/
-class core_session_redis_testcase extends advanced_testcase {
+class session_redis_test extends \advanced_testcase {
/** @var $keyprefix This key prefix used when testing Redis */
protected $keyprefix = null;
diff --git a/lib/tests/sessionlib_test.php b/lib/tests/sessionlib_test.php
index 70b91ca25ba..4a9e436c040 100644
--- a/lib/tests/sessionlib_test.php
+++ b/lib/tests/sessionlib_test.php
@@ -14,28 +14,18 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for sessionlib.php file.
- *
- * @package core
- * @category phpunit
- * @author Petr Skoda
- * @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
+namespace core;
/**
* Unit tests for sessionlib.php file.
*
* @package core
- * @category phpunit
+ * @category test
* @author Petr Skoda
* @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_sessionlib_testcase extends advanced_testcase {
+class sessionlib_test extends \advanced_testcase {
public function test_cron_setup_user() {
global $PAGE, $USER, $SESSION, $SITE, $CFG;
$this->resetAfterTest();
@@ -50,7 +40,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user();
$this->assertSame($admin->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($SITE->id));
+ $this->assertSame($PAGE->context, \context_course::instance($SITE->id));
$this->assertSame($CFG->timezone, $USER->timezone);
$this->assertSame('', $USER->lang);
$this->assertSame('', $USER->theme);
@@ -64,7 +54,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user(null, $course);
$this->assertSame($admin->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($course->id));
+ $this->assertSame($PAGE->context, \context_course::instance($course->id));
$this->assertSame($adminsession, $SESSION);
$this->assertSame($GLOBALS['SESSION'], $_SESSION['SESSION']);
$this->assertSame($GLOBALS['SESSION'], $SESSION);
@@ -73,7 +63,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user($user1);
$this->assertSame($user1->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($SITE->id));
+ $this->assertSame($PAGE->context, \context_course::instance($SITE->id));
$this->assertNotSame($adminsession, $SESSION);
$this->assertObjectNotHasAttribute('test1', $SESSION);
$this->assertEmpty((array)$SESSION);
@@ -86,7 +76,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user($user1);
$this->assertSame($user1->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($SITE->id));
+ $this->assertSame($PAGE->context, \context_course::instance($SITE->id));
$this->assertNotSame($adminsession, $SESSION);
$this->assertSame($usersession1, $SESSION);
$this->assertSame($GLOBALS['SESSION'], $_SESSION['SESSION']);
@@ -96,7 +86,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user($user2);
$this->assertSame($user2->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($SITE->id));
+ $this->assertSame($PAGE->context, \context_course::instance($SITE->id));
$this->assertNotSame($adminsession, $SESSION);
$this->assertNotSame($usersession1, $SESSION);
$this->assertEmpty((array)$SESSION);
@@ -109,7 +99,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user($user2, $course);
$this->assertSame($user2->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($course->id));
+ $this->assertSame($PAGE->context, \context_course::instance($course->id));
$this->assertNotSame($adminsession, $SESSION);
$this->assertNotSame($usersession1, $SESSION);
$this->assertSame($usersession2, $SESSION);
@@ -120,7 +110,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user($user1);
$this->assertSame($user1->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($SITE->id));
+ $this->assertSame($PAGE->context, \context_course::instance($SITE->id));
$this->assertNotSame($adminsession, $SESSION);
$this->assertNotSame($usersession1, $SESSION);
$this->assertEmpty((array)$SESSION);
@@ -131,7 +121,7 @@ class core_sessionlib_testcase extends advanced_testcase {
cron_setup_user();
$this->assertSame($admin->id, $USER->id);
- $this->assertSame($PAGE->context, context_course::instance($SITE->id));
+ $this->assertSame($PAGE->context, \context_course::instance($SITE->id));
$this->assertSame($adminsession, $SESSION);
$this->assertSame($adminuser, $USER);
$this->assertSame($GLOBALS['SESSION'], $_SESSION['SESSION']);
@@ -279,7 +269,7 @@ class core_sessionlib_testcase extends advanced_testcase {
try {
confirm_sesskey();
$this->fail('Exception expected when sesskey not present');
- } catch (moodle_exception $e) {
+ } catch (\moodle_exception $e) {
$this->assertSame('missingparam', $e->errorcode);
}
@@ -301,7 +291,7 @@ class core_sessionlib_testcase extends advanced_testcase {
try {
require_sesskey();
$this->fail('Exception expected when sesskey not present');
- } catch (moodle_exception $e) {
+ } catch (\moodle_exception $e) {
$this->assertSame('missingparam', $e->errorcode);
}
@@ -312,7 +302,7 @@ class core_sessionlib_testcase extends advanced_testcase {
try {
require_sesskey();
$this->fail('Exception expected when sesskey not incorrect');
- } catch (moodle_exception $e) {
+ } catch (\moodle_exception $e) {
$this->assertSame('invalidsesskey', $e->errorcode);
}
}
diff --git a/lib/tests/setuplib_test.php b/lib/tests/setuplib_test.php
index 9d165b99dd7..d2c65355291 100644
--- a/lib/tests/setuplib_test.php
+++ b/lib/tests/setuplib_test.php
@@ -14,24 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
* Unit tests for setuplib.php
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Unit tests for setuplib.php
- *
- * @copyright 2012 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_setuplib_testcase extends advanced_testcase {
+class setuplib_test extends \advanced_testcase {
/**
* Test get_docs_url_standard in the normal case when we should link to Moodle docs.
@@ -91,7 +84,7 @@ class core_setuplib_testcase extends advanced_testcase {
$expected .= "[$cfgname] ";
}
}
- $exception = new moodle_exception('generalexceptionmessage', 'error', '', $fixture, $fixture);
+ $exception = new \moodle_exception('generalexceptionmessage', 'error', '', $fixture, $fixture);
$exceptioninfo = get_exception_info($exception);
$this->assertStringContainsString($expected, $exceptioninfo->message,
@@ -371,45 +364,45 @@ class core_setuplib_testcase extends advanced_testcase {
// Simple local URL.
$url = $CFG->wwwroot . '/something/here?really=yes';
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($url, $infos->link);
// Relative local URL.
$url = '/something/here?really=yes';
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($CFG->wwwroot . '/', $infos->link);
// HTTPS URL when login HTTPS is not enabled (default) and site is HTTP.
$CFG->wwwroot = str_replace('https:', 'http:', $CFG->wwwroot);
$url = $httpswwwroot . '/something/here?really=yes';
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($CFG->wwwroot . '/', $infos->link);
// HTTPS URL when login HTTPS is not enabled and site is HTTPS.
$CFG->wwwroot = str_replace('http:', 'https:', $CFG->wwwroot);
$url = $httpswwwroot . '/something/here?really=yes';
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($url, $infos->link);
// External HTTP URL.
$url = 'http://moodle.org/something/here?really=yes';
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($CFG->wwwroot . '/', $infos->link);
// External HTTPS URL.
$url = 'https://moodle.org/something/here?really=yes';
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($CFG->wwwroot . '/', $infos->link);
// External URL containing local URL.
$url = 'http://moodle.org/something/here?' . $CFG->wwwroot;
- $exception = new moodle_exception('none', 'error', $url);
+ $exception = new \moodle_exception('none', 'error', $url);
$infos = $this->get_exception_info($exception);
$this->assertSame($CFG->wwwroot . '/', $infos->link);
}
@@ -423,7 +416,7 @@ class core_setuplib_testcase extends advanced_testcase {
public function get_exception_info($ex) {
try {
throw $ex;
- } catch (moodle_exception $e) {
+ } catch (\moodle_exception $e) {
return get_exception_info($e);
}
}
@@ -497,7 +490,7 @@ class core_setuplib_testcase extends advanced_testcase {
}
// The \core\uuid::generate_uuid_via_pecl_uuid_extension static method is protected. Use Reflection to call the method.
- $method = new ReflectionMethod('\core\uuid', 'generate_uuid_via_pecl_uuid_extension');
+ $method = new \ReflectionMethod('\core\uuid', 'generate_uuid_via_pecl_uuid_extension');
$method->setAccessible(true);
$uuid = $method->invoke(null);
$this->assertTrue(self::is_valid_uuid_v4($uuid), "Invalid v4 uuid: '$uuid'");
@@ -509,12 +502,12 @@ class core_setuplib_testcase extends advanced_testcase {
public function test_core_uuid_generate_uuid_via_random_bytes() {
try {
random_bytes(1);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
$this->markTestSkipped('No source of entropy for random_bytes. ' . $e->getMessage());
}
// The \core\uuid::generate_uuid_via_random_bytes static method is protected. Use Reflection to call the method.
- $method = new ReflectionMethod('\core\uuid', 'generate_uuid_via_random_bytes');
+ $method = new \ReflectionMethod('\core\uuid', 'generate_uuid_via_random_bytes');
$method->setAccessible(true);
$uuid = $method->invoke(null);
$this->assertTrue(self::is_valid_uuid_v4($uuid), "Invalid v4 uuid: '$uuid'");
diff --git a/lib/tests/statslib_test.php b/lib/tests/statslib_test.php
index e57e034c4f3..c3551156f12 100644
--- a/lib/tests/statslib_test.php
+++ b/lib/tests/statslib_test.php
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * 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());
diff --git a/lib/tests/string_manager_standard_test.php b/lib/tests/string_manager_standard_test.php
index c167707e874..ec320ada7da 100644
--- a/lib/tests/string_manager_standard_test.php
+++ b/lib/tests/string_manager_standard_test.php
@@ -23,6 +23,10 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
+namespace core;
+
+use core_string_manager_standard;
+
defined('MOODLE_INTERNAL') || die();
global $CFG;
@@ -31,10 +35,14 @@ require_once($CFG->libdir.'/moodlelib.php');
/**
* Tests for the API of the string_manager.
*
+ * Unit tests for localization support in lib/moodlelib.php
+ *
+ * @package core
+ * @category test
* @copyright 2013 David Mudrak
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_string_manager_standard_testcase extends advanced_testcase {
+class string_manager_standard_test extends \advanced_testcase {
public function test_string_manager_instance() {
$this->resetAfterTest();
@@ -116,7 +124,7 @@ class core_string_manager_standard_testcase extends advanced_testcase {
$this->assertEquals($matches[2], clean_param($matches[2], PARAM_COMPONENT),
"Component name {$string} appearing in one of the lang/en/deprecated.txt files does not have correct syntax");
- list($pluginttype, $pluginname) = core_component::normalize_component($matches[2]);
+ list($pluginttype, $pluginname) = \core_component::normalize_component($matches[2]);
$normcomponent = $pluginname ? ($pluginttype . '_' . $pluginname) : $pluginttype;
$this->assertEquals($normcomponent, $matches[2],
'String "'.$string.'" appearing in one of the lang/en/deprecated.txt files does not have normalised component name');
diff --git a/lib/tests/tablelib_test.php b/lib/tests/tablelib_test.php
index 75c3d8a1858..d7494cd976f 100644
--- a/lib/tests/tablelib_test.php
+++ b/lib/tests/tablelib_test.php
@@ -14,14 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Test tablelib.
- *
- * @package core
- * @category phpunit
- * @copyright 2013 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use flexible_table;
+use testable_flexible_table;
defined('MOODLE_INTERNAL') || die();
@@ -33,11 +29,11 @@ require_once($CFG->libdir . '/tests/fixtures/testable_flexible_table.php');
* Test some of tablelib.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2013 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_tablelib_testcase extends advanced_testcase {
+class tablelib_test extends \advanced_testcase {
protected function generate_columns($cols) {
$columns = array();
foreach (range(0, $cols - 1) as $j) {
@@ -405,7 +401,7 @@ class core_tablelib_testcase extends advanced_testcase {
// Prohibit the viewfullnames from the default user role.
$userrole = $DB->get_record('role', ['id' => $CFG->defaultuserroleid]);
- role_change_permission($userrole->id, context_system::instance(), 'moodle/site:viewfullnames', CAP_PROHIBIT);
+ role_change_permission($userrole->id, \context_system::instance(), 'moodle/site:viewfullnames', CAP_PROHIBIT);
$user = $this->getDataGenerator()->create_user();
diff --git a/lib/tests/adhoc_task_test.php b/lib/tests/task/adhoc_task_test.php
similarity index 60%
rename from lib/tests/adhoc_task_test.php
rename to lib/tests/task/adhoc_task_test.php
index cc9b135e943..f695c6502c5 100644
--- a/lib/tests/adhoc_task_test.php
+++ b/lib/tests/task/adhoc_task_test.php
@@ -14,28 +14,21 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * This file contains the unittests for adhock tasks.
- *
- * @package core
- * @category phpunit
- * @copyright 2013 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core\task;
defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__ . '/fixtures/task_fixtures.php');
+require_once(__DIR__ . '/../fixtures/task_fixtures.php');
/**
* Test class for adhoc tasks.
*
* @package core
- * @category task
+ * @category test
* @copyright 2013 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_adhoc_task_testcase extends advanced_testcase {
+class adhoc_task_test extends \advanced_testcase {
/**
* Test basic adhoc task execution.
@@ -44,17 +37,17 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Create an adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
// Queue it.
- \core\task\manager::queue_adhoc_task($task);
+ manager::queue_adhoc_task($task);
$now = time();
// Get it from the scheduler.
- $task = \core\task\manager::get_next_adhoc_task($now);
+ $task = manager::get_next_adhoc_task($now);
$this->assertInstanceOf('\\core\\task\\adhoc_test_task', $task);
$task->execute();
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
}
/**
@@ -64,28 +57,28 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Create an adhoc task.
- $task = new \core\task\adhoc_test_task();
- \core\task\manager::queue_adhoc_task($task);
+ $task = new adhoc_test_task();
+ manager::queue_adhoc_task($task);
$now = time();
// Get it from the scheduler, execute it, and mark it as failed.
- $task = \core\task\manager::get_next_adhoc_task($now);
+ $task = manager::get_next_adhoc_task($now);
$task->execute();
- \core\task\manager::adhoc_task_failed($task);
+ manager::adhoc_task_failed($task);
// The task will not be returned immediately.
- $this->assertNull(\core\task\manager::get_next_adhoc_task($now));
+ $this->assertNull(manager::get_next_adhoc_task($now));
// Should get the adhoc task (retry after delay).
- $task = \core\task\manager::get_next_adhoc_task($now + 120);
+ $task = manager::get_next_adhoc_task($now + 120);
$this->assertInstanceOf('\\core\\task\\adhoc_test_task', $task);
$task->execute();
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
// Should not get any task.
- $this->assertNull(\core\task\manager::get_next_adhoc_task($now));
+ $this->assertNull(manager::get_next_adhoc_task($now));
}
/**
@@ -96,18 +89,18 @@ class core_adhoc_task_testcase extends advanced_testcase {
$now = time();
// Create an adhoc task in future.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_next_run_time($now + 1000);
- \core\task\manager::queue_adhoc_task($task);
+ manager::queue_adhoc_task($task);
// Fetching the next task should not return anything.
- $this->assertNull(\core\task\manager::get_next_adhoc_task($now));
+ $this->assertNull(manager::get_next_adhoc_task($now));
// Fetching in the future should return the task.
- $task = \core\task\manager::get_next_adhoc_task($now + 1020);
+ $task = manager::get_next_adhoc_task($now + 1020);
$this->assertInstanceOf('\\core\\task\\adhoc_test_task', $task);
$task->execute();
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
}
/**
@@ -119,7 +112,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
$task = new \mod_forum\task\refresh_forum_post_counts();
$task->set_component('mod_test');
- \core\task\manager::queue_adhoc_task($task);
+ manager::queue_adhoc_task($task);
$this->assertDebuggingNotCalled();
}
@@ -131,7 +124,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
$task = new \mod_forum\task\refresh_forum_post_counts();
- \core\task\manager::queue_adhoc_task($task);
+ manager::queue_adhoc_task($task);
$this->assertDebuggingNotCalled();
// Assert the missing component was set.
@@ -146,7 +139,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
$task = new \mod_fake\task\adhoc_component_task();
- \core\task\manager::queue_adhoc_task($task);
+ manager::queue_adhoc_task($task);
$this->assertDebuggingCalled('Component not set and the class namespace does not match a valid component (mod_fake).');
}
@@ -156,7 +149,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
public function test_get_adhoc_tasks_empty_set() {
$this->resetAfterTest(true);
- $this->assertEquals([], \core\task\manager::get_adhoc_tasks('\\core\\task\\adhoc_test_task'));
+ $this->assertEquals([], manager::get_adhoc_tasks('\\core\\task\\adhoc_test_task'));
}
/**
@@ -166,17 +159,17 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
for ($i = 0; $i < 3; $i++) {
- $task = new \core\task\adhoc_test_task();
- \core\task\manager::queue_adhoc_task($task);
+ $task = new adhoc_test_task();
+ manager::queue_adhoc_task($task);
}
for ($i = 0; $i < 3; $i++) {
- $task = new \core\task\adhoc_test2_task();
- \core\task\manager::queue_adhoc_task($task);
+ $task = new adhoc_test2_task();
+ manager::queue_adhoc_task($task);
}
- $adhoctests = \core\task\manager::get_adhoc_tasks('\\core\\task\\adhoc_test_task');
- $adhoctest2s = \core\task\manager::get_adhoc_tasks('\\core\\task\\adhoc_test2_task');
+ $adhoctests = manager::get_adhoc_tasks('\\core\\task\\adhoc_test_task');
+ $adhoctest2s = manager::get_adhoc_tasks('\\core\\task\\adhoc_test2_task');
$this->assertCount(3, $adhoctests);
$this->assertCount(3, $adhoctest2s);
@@ -197,10 +190,10 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Schedule adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
- $this->assertEquals(1, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ manager::reschedule_or_queue_adhoc_task($task);
+ $this->assertEquals(1, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
}
/**
@@ -212,17 +205,17 @@ class core_adhoc_task_testcase extends advanced_testcase {
$user = \core_user::get_user_by_username('admin');
// Schedule adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
// Schedule adhoc task for a different user.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
$task->set_userid($user->id);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
- $this->assertEquals(2, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertEquals(2, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
}
/**
@@ -233,16 +226,16 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Schedule adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
// Schedule adhoc task for a different user.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 11]);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
- $this->assertEquals(2, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertEquals(2, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
}
/**
@@ -253,20 +246,20 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Schedule adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
$task->set_next_run_time(time() + DAYSECS);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
- $before = \core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task');
+ $before = manager::get_adhoc_tasks('core\task\adhoc_test_task');
// Schedule the task again but do not specify a time.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
- $this->assertEquals(1, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
- $this->assertEquals($before, \core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task'));
+ $this->assertEquals(1, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertEquals($before, manager::get_adhoc_tasks('core\task\adhoc_test_task'));
}
/**
@@ -278,20 +271,20 @@ class core_adhoc_task_testcase extends advanced_testcase {
$newruntime = time() + WEEKSECS;
// Schedule adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
$task->set_next_run_time($initialruntime);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
- $before = \core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task');
+ $before = manager::get_adhoc_tasks('core\task\adhoc_test_task');
// Schedule the task again.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(['courseid' => 10]);
$task->set_next_run_time($newruntime);
- \core\task\manager::reschedule_or_queue_adhoc_task($task);
+ manager::reschedule_or_queue_adhoc_task($task);
- $tasks = \core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task');
+ $tasks = manager::get_adhoc_tasks('core\task\adhoc_test_task');
$this->assertEquals(1, count($tasks));
$this->assertNotEquals($before, $tasks);
$firsttask = reset($tasks);
@@ -306,61 +299,61 @@ class core_adhoc_task_testcase extends advanced_testcase {
$user = \core_user::get_user_by_username('admin');
// Schedule adhoc task.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(array('courseid' => 10));
- $this->assertNotEmpty(\core\task\manager::queue_adhoc_task($task, true));
- $this->assertEquals(1, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertNotEmpty(manager::queue_adhoc_task($task, true));
+ $this->assertEquals(1, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule adhoc task with a user.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(array('courseid' => 10));
$task->set_userid($user->id);
- $this->assertNotEmpty(\core\task\manager::queue_adhoc_task($task, true));
- $this->assertEquals(2, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertNotEmpty(manager::queue_adhoc_task($task, true));
+ $this->assertEquals(2, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task with different custom data.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(array('courseid' => 1));
- $this->assertNotEmpty(\core\task\manager::queue_adhoc_task($task, true));
- $this->assertEquals(3, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertNotEmpty(manager::queue_adhoc_task($task, true));
+ $this->assertEquals(3, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task with same custom data.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(array('courseid' => 1));
- $this->assertEmpty(\core\task\manager::queue_adhoc_task($task, true));
- $this->assertEquals(3, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertEmpty(manager::queue_adhoc_task($task, true));
+ $this->assertEquals(3, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task with same custom data and a user.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$task->set_custom_data(array('courseid' => 1));
$task->set_userid($user->id);
- $this->assertNotEmpty(\core\task\manager::queue_adhoc_task($task, true));
- $this->assertEquals(4, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertNotEmpty(manager::queue_adhoc_task($task, true));
+ $this->assertEquals(4, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task without custom data.
// Note: This task was created earlier.
- $task = new \core\task\adhoc_test_task();
- $this->assertNotEmpty(\core\task\manager::queue_adhoc_task($task, true));
- $this->assertEquals(5, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $task = new adhoc_test_task();
+ $this->assertNotEmpty(manager::queue_adhoc_task($task, true));
+ $this->assertEquals(5, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task without custom data (again).
- $task5 = new \core\task\adhoc_test_task();
- $this->assertEmpty(\core\task\manager::queue_adhoc_task($task5, true));
- $this->assertEquals(5, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $task5 = new adhoc_test_task();
+ $this->assertEmpty(manager::queue_adhoc_task($task5, true));
+ $this->assertEquals(5, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task without custom data but with a userid.
- $task6 = new \core\task\adhoc_test_task();
+ $task6 = new adhoc_test_task();
$user = \core_user::get_user_by_username('admin');
$task6->set_userid($user->id);
- $this->assertNotEmpty(\core\task\manager::queue_adhoc_task($task6, true));
- $this->assertEquals(6, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertNotEmpty(manager::queue_adhoc_task($task6, true));
+ $this->assertEquals(6, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
// Schedule same adhoc task again without custom data but with a userid.
- $task6 = new \core\task\adhoc_test_task();
+ $task6 = new adhoc_test_task();
$user = \core_user::get_user_by_username('admin');
$task6->set_userid($user->id);
- $this->assertEmpty(\core\task\manager::queue_adhoc_task($task6, true));
- $this->assertEquals(6, count(\core\task\manager::get_adhoc_tasks('core\task\adhoc_test_task')));
+ $this->assertEmpty(manager::queue_adhoc_task($task6, true));
+ $this->assertEquals(6, count(manager::get_adhoc_tasks('core\task\adhoc_test_task')));
}
/**
@@ -371,13 +364,13 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Create an adhoc task in future.
- $task = new \core\task\adhoc_test_task();
- \core\task\manager::queue_adhoc_task($task);
+ $task = new adhoc_test_task();
+ manager::queue_adhoc_task($task);
// Get it back from the scheduler.
$now = time();
- $task = \core\task\manager::get_next_adhoc_task($now);
- \core\task\manager::adhoc_task_complete($task);
+ $task = manager::get_next_adhoc_task($now);
+ manager::adhoc_task_complete($task);
$this->assertEmpty($task->get_userid());
}
@@ -390,15 +383,15 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Create an adhoc task in future.
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$user = \core_user::get_user_by_username('admin');
$task->set_userid($user->id);
- \core\task\manager::queue_adhoc_task($task);
+ manager::queue_adhoc_task($task);
// Get it back from the scheduler.
$now = time();
- $task = \core\task\manager::get_next_adhoc_task($now);
- \core\task\manager::adhoc_task_complete($task);
+ $task = manager::get_next_adhoc_task($now);
+ manager::adhoc_task_complete($task);
$this->assertEquals($user->id, $task->get_userid());
}
@@ -408,7 +401,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
*/
public function test_get_concurrency_limit() {
$this->resetAfterTest(true);
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$concurrencylimit = $task->get_concurrency_limit();
$this->assertEquals(0, $concurrencylimit);
}
@@ -419,7 +412,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
public function test_get_concurrency_limit_default() {
$this->resetAfterTest(true);
set_config('task_concurrency_limit_default', 10);
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$concurrencylimit = $task->get_concurrency_limit();
$this->assertEquals(10, $concurrencylimit);
}
@@ -432,7 +425,7 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
set_config('task_concurrency_limit_default', 10);
$CFG->task_concurrency_limit = array('core\task\adhoc_test_task' => 5);
- $task = new \core\task\adhoc_test_task();
+ $task = new adhoc_test_task();
$concurrencylimit = $task->get_concurrency_limit();
$this->assertEquals(5, $concurrencylimit);
}
@@ -444,42 +437,42 @@ class core_adhoc_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Create adhoc tasks.
- $task1 = new \core\task\adhoc_test_task();
+ $task1 = new adhoc_test_task();
$task1->set_next_run_time(1510000000);
$task1->set_custom_data_as_string('Task 1');
- \core\task\manager::queue_adhoc_task($task1);
+ manager::queue_adhoc_task($task1);
- $task2 = new \core\task\adhoc_test_task();
+ $task2 = new adhoc_test_task();
$task2->set_next_run_time(1520000000);
$task2->set_custom_data_as_string('Task 2');
- \core\task\manager::queue_adhoc_task($task2);
+ manager::queue_adhoc_task($task2);
- $task3 = new \core\task\adhoc_test_task();
+ $task3 = new adhoc_test_task();
$task3->set_next_run_time(1520000000);
$task3->set_custom_data_as_string('Task 3');
- \core\task\manager::queue_adhoc_task($task3);
+ manager::queue_adhoc_task($task3);
// Shuffle tasks.
$task1->set_next_run_time(1540000000);
- \core\task\manager::reschedule_or_queue_adhoc_task($task1);
+ manager::reschedule_or_queue_adhoc_task($task1);
$task3->set_next_run_time(1530000000);
- \core\task\manager::reschedule_or_queue_adhoc_task($task3);
+ manager::reschedule_or_queue_adhoc_task($task3);
$task2->set_next_run_time(1530000000);
- \core\task\manager::reschedule_or_queue_adhoc_task($task2);
+ manager::reschedule_or_queue_adhoc_task($task2);
// Confirm, that tasks are sorted by nextruntime and then by id (ascending).
- $task = \core\task\manager::get_next_adhoc_task(time());
+ $task = manager::get_next_adhoc_task(time());
$this->assertEquals('Task 2', $task->get_custom_data_as_string());
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
- $task = \core\task\manager::get_next_adhoc_task(time());
+ $task = manager::get_next_adhoc_task(time());
$this->assertEquals('Task 3', $task->get_custom_data_as_string());
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
- $task = \core\task\manager::get_next_adhoc_task(time());
+ $task = manager::get_next_adhoc_task(time());
$this->assertEquals('Task 1', $task->get_custom_data_as_string());
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
}
}
diff --git a/lib/tests/calendar_cron_task_test.php b/lib/tests/task/calendar_cron_task_test.php
similarity index 82%
rename from lib/tests/calendar_cron_task_test.php
rename to lib/tests/task/calendar_cron_task_test.php
index a880f9b0ff6..2cf73c3ed4e 100644
--- a/lib/tests/calendar_cron_task_test.php
+++ b/lib/tests/task/calendar_cron_task_test.php
@@ -14,13 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Contains the class containing unit tests for the calendar cron task.
- *
- * @package core
- * @copyright 2017 Mark Nelson
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core\task;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +28,7 @@ require_once($CFG->dirroot . '/calendar/lib.php');
* @copyright 2017 Mark Nelson
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_calendar_cron_task_testcase extends advanced_testcase {
+class calendar_cron_task_test extends \advanced_testcase {
/**
* Tests set up
@@ -50,7 +44,7 @@ class core_calendar_cron_task_testcase extends advanced_testcase {
// ICal URL from external test repo.
$subscriptionurl = $this->getExternalTestFileUrl('/ical.ics');
- $subscription = new stdClass();
+ $subscription = new \stdClass();
$subscription->eventtype = 'site';
$subscription->name = 'test';
$subscription->url = $subscriptionurl;
@@ -59,7 +53,7 @@ class core_calendar_cron_task_testcase extends advanced_testcase {
calendar_add_subscription($subscription);
$this->expectOutputRegex('/Events imported: .* Events skipped: .* Events updated:/');
- $task = new \core\task\calendar_cron_task();
+ $task = new calendar_cron_task();
$task->execute();
}
@@ -67,7 +61,7 @@ class core_calendar_cron_task_testcase extends advanced_testcase {
* Test calendar cron task with a broken subscription URL.
*/
public function test_cron_broken_url() {
- $subscription = new stdClass();
+ $subscription = new \stdClass();
$subscription->eventtype = 'site';
$subscription->name = 'test';
$subscription->url = 'brokenurl';
@@ -76,7 +70,7 @@ class core_calendar_cron_task_testcase extends advanced_testcase {
calendar_add_subscription($subscription);
$this->expectOutputRegex('/Error updating calendar subscription: The given iCal URL is invalid/');
- $task = new \core\task\calendar_cron_task();
+ $task = new calendar_cron_task();
$task->execute();
}
}
diff --git a/lib/tests/task_database_logger_test.php b/lib/tests/task/database_logger_test.php
similarity index 97%
rename from lib/tests/task_database_logger_test.php
rename to lib/tests/task/database_logger_test.php
index 7d728a32013..3ea897eb7fd 100644
--- a/lib/tests/task_database_logger_test.php
+++ b/lib/tests/task/database_logger_test.php
@@ -14,26 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core\task;
+
/**
* This file contains the unit tests for the database task logger.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2018 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-
-defined('MOODLE_INTERNAL') || die();
-
-use \core\task\database_logger;
-
-/**
- * This file contains the unit tests for the database task logger.
- *
- * @copyright 2018 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class task_database_logger_testcase extends advanced_testcase {
+class database_logger_test extends \advanced_testcase {
/**
* @var \moodle_database The original database prior to mocking
@@ -267,7 +258,7 @@ class task_database_logger_testcase extends advanced_testcase {
set_config('task_logretainruns', 1000);
// Create sample log data - 1 run per hour for 3 days - round down to the start of the hour to avoid time race conditions.
- $date = new DateTime();
+ $date = new \DateTime();
$date->setTime($date->format('G'), 0);
$baselogtime = $date->getTimestamp();
@@ -331,7 +322,7 @@ class task_database_logger_testcase extends advanced_testcase {
set_config('task_logretention', YEARSECS);
// Create sample log data - 2 tasks, once per hour for 3 days.
- $date = new DateTime();
+ $date = new \DateTime();
$date->setTime($date->format('G'), 0);
$firstdate = $date->getTimestamp();
@@ -434,7 +425,7 @@ class task_database_logger_testcase extends advanced_testcase {
$this->resetAfterTest();
// Calculate date to be used for logs, starting from current time rounded down to nearest hour.
- $date = new DateTime();
+ $date = new \DateTime();
$date->setTime($date->format('G'), 0);
$baselogtime = $date->getTimestamp();
diff --git a/lib/tests/h5p_get_content_types_task_test.php b/lib/tests/task/h5p_get_content_types_task_test.php
similarity index 87%
rename from lib/tests/h5p_get_content_types_task_test.php
rename to lib/tests/task/h5p_get_content_types_task_test.php
index 572e49ebfbb..ccb42ea2bd8 100644
--- a/lib/tests/h5p_get_content_types_task_test.php
+++ b/lib/tests/task/h5p_get_content_types_task_test.php
@@ -14,19 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for the task that fetch the latest version of H5P content types.
- *
- * @package core
- * @copyright 2019 Victor Deniz
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core\task;
use core_h5p\local\library\autoloader;
use core_h5p\h5p_test_factory;
-defined('MOODLE_INTERNAL') || die();
-
/**
* Class containing unit tests for the task that fetch the latest version of H5P content types.
*
@@ -36,7 +28,7 @@ defined('MOODLE_INTERNAL') || die();
*
* @runTestsInSeparateProcesses
*/
-class h5p_get_content_types_task_testcase extends advanced_testcase {
+class h5p_get_content_types_task_test extends \advanced_testcase {
protected function setup(): void {
global $CFG;
diff --git a/lib/tests/task_logging_test.php b/lib/tests/task/logging_test.php
similarity index 80%
rename from lib/tests/task_logging_test.php
rename to lib/tests/task/logging_test.php
index 0aff4da5a0a..ee0df88197d 100644
--- a/lib/tests/task_logging_test.php
+++ b/lib/tests/task/logging_test.php
@@ -18,22 +18,25 @@
* This file contains the unit tests for the task logging system.
*
* @package core
- * @category phpunit
+ * @category test
* @copyright 2018 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__ . '/fixtures/task_fixtures.php');
+namespace core\task;
+defined('MOODLE_INTERNAL') || die();
+require_once(__DIR__ . '/../fixtures/task_fixtures.php');
/**
* This file contains the unit tests for the task logging system.
*
+ * @package core
+ * @category test
* @copyright 2018 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_task_logmanager extends advanced_testcase {
+class logging_test extends \advanced_testcase {
/**
* @var \moodle_database The original database prior to mocking
@@ -47,7 +50,7 @@ class core_task_logmanager extends advanced_testcase {
global $DB;
// Ensure that any logging is always ended.
- \core\task\logmanager::finalise_log();
+ logmanager::finalise_log();
if (null !== $this->DB) {
$DB = $this->DB;
@@ -62,12 +65,12 @@ class core_task_logmanager extends advanced_testcase {
global $CFG;
$this->resetAfterTest();
- $CFG->task_logmode = \core\task\logmanager::MODE_NONE;
+ $CFG->task_logmode = logmanager::MODE_NONE;
$initialbufferstate = ob_get_status();
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
// There will be no additional output buffer.
$this->assertEquals($initialbufferstate, ob_get_status());
@@ -80,12 +83,12 @@ class core_task_logmanager extends advanced_testcase {
global $CFG;
$this->resetAfterTest();
- $CFG->task_logmode = \core\task\logmanager::MODE_ALL;
+ $CFG->task_logmode = logmanager::MODE_ALL;
$initialbufferstate = ob_get_status();
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
// Fetch the new output buffer state.
$state = ob_get_status();
@@ -101,12 +104,12 @@ class core_task_logmanager extends advanced_testcase {
global $CFG;
$this->resetAfterTest();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$initialbufferstate = ob_get_status();
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
// Fetch the new output buffer state.
$state = ob_get_status();
@@ -122,16 +125,16 @@ class core_task_logmanager extends advanced_testcase {
global $CFG;
$this->resetAfterTest();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$logger = $this->get_mocked_logger();
$initialbufferstate = ob_get_status();
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
- \core\task\manager::adhoc_task_complete($task);
+ manager::adhoc_task_complete($task);
$this->assertEmpty($logger::$storelogfortask);
}
@@ -143,16 +146,16 @@ class core_task_logmanager extends advanced_testcase {
global $CFG;
$this->resetAfterTest();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$logger = $this->get_mocked_logger();
$initialbufferstate = ob_get_status();
$task = $this->get_test_scheduled_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
- \core\task\manager::scheduled_task_complete($task);
+ manager::scheduled_task_complete($task);
$this->assertEmpty($logger::$storelogfortask);
}
@@ -170,12 +173,12 @@ class core_task_logmanager extends advanced_testcase {
$task = $this->get_test_adhoc_task();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$logger = $this->get_mocked_logger();
- \core\task\logmanager::start_logging($task);
- \core\task\manager::adhoc_task_failed($task);
+ logmanager::start_logging($task);
+ manager::adhoc_task_failed($task);
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -195,12 +198,12 @@ class core_task_logmanager extends advanced_testcase {
$task = $this->get_test_scheduled_task();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$logger = $this->get_mocked_logger();
- \core\task\logmanager::start_logging($task);
- \core\task\manager::scheduled_task_failed($task);
+ logmanager::start_logging($task);
+ manager::scheduled_task_failed($task);
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -220,12 +223,12 @@ class core_task_logmanager extends advanced_testcase {
$task = $this->get_test_adhoc_task();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$logger = $this->get_mocked_logger();
- \core\task\logmanager::start_logging($task);
- \core\task\manager::adhoc_task_failed($task);
+ logmanager::start_logging($task);
+ manager::adhoc_task_failed($task);
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -245,12 +248,12 @@ class core_task_logmanager extends advanced_testcase {
$task = $this->get_test_scheduled_task();
- $CFG->task_logmode = \core\task\logmanager::MODE_FAILONLY;
+ $CFG->task_logmode = logmanager::MODE_FAILONLY;
$logger = $this->get_mocked_logger();
- \core\task\logmanager::start_logging($task);
- \core\task\manager::scheduled_task_failed($task);
+ logmanager::start_logging($task);
+ manager::scheduled_task_failed($task);
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -269,12 +272,12 @@ class core_task_logmanager extends advanced_testcase {
$task = $this->get_test_adhoc_task();
- $CFG->task_logmode = \core\task\logmanager::MODE_ALL;
+ $CFG->task_logmode = logmanager::MODE_ALL;
$logger = $this->get_mocked_logger();
- \core\task\logmanager::start_logging($task);
- \core\task\manager::adhoc_task_complete($task);
+ logmanager::start_logging($task);
+ manager::adhoc_task_complete($task);
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -293,12 +296,12 @@ class core_task_logmanager extends advanced_testcase {
$task = $this->get_test_scheduled_task();
- $CFG->task_logmode = \core\task\logmanager::MODE_ALL;
+ $CFG->task_logmode = logmanager::MODE_ALL;
$logger = $this->get_mocked_logger();
- \core\task\logmanager::start_logging($task);
- \core\task\manager::scheduled_task_complete($task);
+ logmanager::start_logging($task);
+ manager::scheduled_task_complete($task);
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -312,10 +315,10 @@ class core_task_logmanager extends advanced_testcase {
$this->resetAfterTest();
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
$this->expectException(\coding_exception::class);
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
}
/**
@@ -327,11 +330,11 @@ class core_task_logmanager extends advanced_testcase {
$logger = $this->get_mocked_logger();
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
- \core\task\logmanager::finalise_log();
+ logmanager::start_logging($task);
+ logmanager::finalise_log();
- \core\task\logmanager::start_logging($task);
- \core\task\logmanager::finalise_log();
+ logmanager::start_logging($task);
+ logmanager::finalise_log();
$this->assertCount(2, $logger::$storelogfortask);
$this->assertEquals($task, $logger::$storelogfortask[0][0]);
@@ -346,7 +349,7 @@ class core_task_logmanager extends advanced_testcase {
public function test_finalise_log_no_logging() {
$initialbufferstate = ob_get_status();
- \core\task\logmanager::finalise_log();
+ logmanager::finalise_log();
// There will be no additional output buffer.
$this->assertEquals($initialbufferstate, ob_get_status());
@@ -363,15 +366,15 @@ class core_task_logmanager extends advanced_testcase {
$testoutput = "I am the output under test.\n";
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
echo $testoutput;
$this->expectOutputString($testoutput);
- \core\task\logmanager::flush();
+ logmanager::flush();
// Finalise the log.
- \core\task\logmanager::finalise_log();
+ logmanager::finalise_log();
$this->assertCount(1, $logger::$storelogfortask);
$this->assertEquals($testoutput, file_get_contents($logger::$storelogfortask[0][1]));
@@ -388,16 +391,16 @@ class core_task_logmanager extends advanced_testcase {
$testoutput = "I am the output under test.\n";
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
ob_start();
echo $testoutput;
ob_end_clean();
- \core\task\logmanager::flush();
+ logmanager::flush();
// Finalise the log.
- \core\task\logmanager::finalise_log();
+ logmanager::finalise_log();
$this->assertCount(1, $logger::$storelogfortask);
@@ -416,7 +419,7 @@ class core_task_logmanager extends advanced_testcase {
$testoutput = "I am the output under test.\n";
$task = $this->get_test_adhoc_task();
- \core\task\logmanager::start_logging($task);
+ logmanager::start_logging($task);
// We are going to flush the inner buffer. That means that we should expect the output immediately.
$this->expectOutputString($testoutput);
@@ -426,7 +429,7 @@ class core_task_logmanager extends advanced_testcase {
ob_end_flush();
// Finalise the log.
- \core\task\logmanager::finalise_log();
+ logmanager::finalise_log();
$this->assertCount(1, $logger::$storelogfortask);
@@ -437,10 +440,10 @@ class core_task_logmanager extends advanced_testcase {
/**
* Get an example adhoc task to use for testing.
*
- * @return \core\task\adhoc_task
+ * @return adhoc_task
*/
- protected function get_test_adhoc_task() : \core\task\adhoc_task {
- $task = $this->getMockForAbstractClass(\core\task\adhoc_task::class);
+ protected function get_test_adhoc_task() : adhoc_task {
+ $task = $this->getMockForAbstractClass(adhoc_task::class);
$task->set_component('core');
// Mock a lock on the task.
@@ -455,10 +458,10 @@ class core_task_logmanager extends advanced_testcase {
/**
* Get an example scheduled task to use for testing.
*
- * @return \core\task\scheduled_task
+ * @return scheduled_task
*/
- protected function get_test_scheduled_task() : \core\task\scheduled_task {
- $task = $this->getMockForAbstractClass(\core\task\scheduled_task::class);
+ protected function get_test_scheduled_task() : scheduled_task {
+ $task = $this->getMockForAbstractClass(scheduled_task::class);
// Mock a lock on the task.
$lock = $this->getMockBuilder(\core\lock\lock::class)
@@ -472,7 +475,7 @@ class core_task_logmanager extends advanced_testcase {
/**
* Create and configure a mocked task logger.
*
- * @return \core\task\task_logger
+ * @return task_logger
*/
protected function get_mocked_logger() {
global $CFG;
@@ -481,8 +484,8 @@ class core_task_logmanager extends advanced_testcase {
$this->resetAfterTest();
// Note PHPUnit does not support mocking static functions.
- $CFG->task_log_class = \task_logging_test_mocked_logger::class;
- \task_logging_test_mocked_logger::test_reset();
+ $CFG->task_log_class = logging_test_mocked_logger::class;
+ logging_test_mocked_logger::test_reset();
return $CFG->task_log_class;
}
@@ -510,7 +513,7 @@ class core_task_logmanager extends advanced_testcase {
* @copyright 2018 Andrew Nicols
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class task_logging_test_mocked_logger implements \core\task\task_logger {
+class logging_test_mocked_logger implements task_logger {
/**
* @var bool Whether this is configured.
@@ -548,7 +551,7 @@ class task_logging_test_mocked_logger implements \core\task\task_logger {
/**
* Store the log for the specified task.
*
- * @param \core\task\task_base $task The task that the log belongs to.
+ * @param task_base $task The task that the log belongs to.
* @param string $logpath The path to the log on disk
* @param bool $failed Whether the task failed
* @param int $dbreads The number of DB reads
@@ -556,7 +559,7 @@ class task_logging_test_mocked_logger implements \core\task\task_logger {
* @param float $timestart The start time of the task
* @param float $timeend The end time of the task
*/
- public static function store_log_for_task(\core\task\task_base $task, string $logpath, bool $failed,
+ public static function store_log_for_task(task_base $task, string $logpath, bool $failed,
int $dbreads, int $dbwrites, float $timestart, float $timeend) {
self::$storelogfortask[] = func_get_args();
}
diff --git a/lib/tests/scheduled_task_test.php b/lib/tests/task/scheduled_task_test.php
similarity index 82%
rename from lib/tests/scheduled_task_test.php
rename to lib/tests/task/scheduled_task_test.php
index 6bf58323f7a..d85d083390c 100644
--- a/lib/tests/scheduled_task_test.php
+++ b/lib/tests/task/scheduled_task_test.php
@@ -14,33 +14,26 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * This file contains the unittests for scheduled tasks.
- *
- * @package core
- * @category phpunit
- * @copyright 2013 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core\task;
defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__ . '/fixtures/task_fixtures.php');
+require_once(__DIR__ . '/../fixtures/task_fixtures.php');
/**
* Test class for scheduled task.
*
* @package core
- * @category task
+ * @category test
* @copyright 2013 Damyon Wiese
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_scheduled_task_testcase extends advanced_testcase {
+class scheduled_task_test extends \advanced_testcase {
/**
* Test the cron scheduling method
*/
public function test_eval_cron_field() {
- $testclass = new \core\task\scheduled_test_task();
+ $testclass = new scheduled_test_task();
$this->assertEquals(20, count($testclass->eval_cron_field('*/3', 0, 59)));
$this->assertEquals(31, count($testclass->eval_cron_field('1,*/2', 0, 59)));
@@ -62,7 +55,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
$testhour = 1;
// Test job run at 1 am.
- $testclass = new \core\task\scheduled_test_task();
+ $testclass = new scheduled_test_task();
// All fields default to '*'.
$testclass->set_hour($testhour);
@@ -70,7 +63,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Next valid time should be 1am of the next day.
$nexttime = $testclass->get_next_scheduled_time();
- $oneamdate = new DateTime('now', new DateTimeZone('Europe/London'));
+ $oneamdate = new \DateTime('now', new \DateTimeZone('Europe/London'));
$oneamdate->setTime($testhour, 0, 0);
// Once a year (currently last Sunday of March), when changing to Daylight Saving Time,
@@ -85,10 +78,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Make it 1 am tomorrow if the time is after 1am.
if ($oneamdate->getTimestamp() < time()) {
- $oneamdate->add(new DateInterval('P1D'));
+ $oneamdate->add(new \DateInterval('P1D'));
if ($isdaylightsaving) {
// If today is Europe/London Daylight Saving Time Begins, expectation is 1 less hour.
- $oneamdate->sub(new DateInterval('PT1H'));
+ $oneamdate->sub(new \DateInterval('PT1H'));
}
}
$oneam = $oneamdate->getTimestamp();
@@ -101,7 +94,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
$this->assertEquals($oneam, $nexttime, 'Next scheduled time is 1am.');
// Now test for job run every 10 minutes.
- $testclass = new \core\task\scheduled_test_task();
+ $testclass = new scheduled_test_task();
// All fields default to '*'.
$testclass->set_minute('*/10');
@@ -119,7 +112,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
$this->assertEquals($nexttenminutes, $nexttime, 'Next scheduled time is in 10 minutes.');
// Test hourly job executed on Sundays only.
- $testclass = new \core\task\scheduled_test_task();
+ $testclass = new scheduled_test_task();
$testclass->set_minute('0');
$testclass->set_day_of_week('7');
@@ -128,8 +121,8 @@ class core_scheduled_task_testcase extends advanced_testcase {
$this->assertEquals(7, date('N', $nexttime));
$this->assertEquals(0, date('i', $nexttime));
- // Test monthly job
- $testclass = new \core\task\scheduled_test_task();
+ // Test monthly job.
+ $testclass = new scheduled_test_task();
$testclass->set_minute('32');
$testclass->set_hour('0');
$testclass->set_day('1');
@@ -149,7 +142,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
$this->setTimezone('Asia/Kabul');
- $testclass = new \core\task\scheduled_test_task();
+ $testclass = new scheduled_test_task();
// Scheduled tasks should always use servertime - so this is 03:30 GMT.
$testclass->set_hour('1');
@@ -165,13 +158,13 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Should be displayed in user timezone.
// I used http://www.timeanddate.com/worldclock/fixedtime.html?msg=Moodle+Test&iso=20160502T01&p1=113
// setting my location to Kathmandu to verify this time.
- $this->assertStringContainsString('2:15 AM', core_text::strtoupper($userdate));
+ $this->assertStringContainsString('2:15 AM', \core_text::strtoupper($userdate));
}
public function test_reset_scheduled_tasks_for_component_customised(): void {
$this->resetAfterTest(true);
- $tasks = \core\task\manager::load_scheduled_tasks_for_component('moodle');
+ $tasks = manager::load_scheduled_tasks_for_component('moodle');
// Customise a task.
$task = reset($tasks);
@@ -181,13 +174,13 @@ class core_scheduled_task_testcase extends advanced_testcase {
$task->set_month('4');
$task->set_day_of_week('5');
$task->set_customised('1');
- \core\task\manager::configure_scheduled_task($task);
+ manager::configure_scheduled_task($task);
// Now call reset.
- \core\task\manager::reset_scheduled_tasks_for_component('moodle');
+ manager::reset_scheduled_tasks_for_component('moodle');
// Fetch the task again.
- $taskafterreset = \core\task\manager::get_scheduled_task(get_class($task));
+ $taskafterreset = manager::get_scheduled_task(get_class($task));
// The task should still be the same as the customised.
$this->assertTaskEquals($task, $taskafterreset);
@@ -198,23 +191,23 @@ class core_scheduled_task_testcase extends advanced_testcase {
$this->resetAfterTest(true);
// Delete a task to simulate the fact that its new.
- $tasklist = \core\task\manager::load_scheduled_tasks_for_component('moodle');
+ $tasklist = manager::load_scheduled_tasks_for_component('moodle');
// Note: This test must use a task which does not use any random values.
- $task = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $task = manager::get_scheduled_task(session_cleanup_task::class);
$DB->delete_records('task_scheduled', array('classname' => '\\' . trim(get_class($task), '\\')));
- $this->assertFalse(\core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class));
+ $this->assertFalse(manager::get_scheduled_task(session_cleanup_task::class));
// Now call reset on all the tasks.
- \core\task\manager::reset_scheduled_tasks_for_component('moodle');
+ manager::reset_scheduled_tasks_for_component('moodle');
// Assert that the second task was added back.
- $taskafterreset = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $taskafterreset = manager::get_scheduled_task(session_cleanup_task::class);
$this->assertNotFalse($taskafterreset);
$this->assertTaskEquals($task, $taskafterreset);
- $this->assertCount(count($tasklist), \core\task\manager::load_scheduled_tasks_for_component('moodle'));
+ $this->assertCount(count($tasklist), manager::load_scheduled_tasks_for_component('moodle'));
}
public function test_reset_scheduled_tasks_for_component_changed_in_source(): void {
@@ -222,10 +215,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Delete a task to simulate the fact that its new.
// Note: This test must use a task which does not use any random values.
- $task = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $task = manager::get_scheduled_task(session_cleanup_task::class);
// Get a copy of the task before maing changes for later comparison.
- $taskbeforechange = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $taskbeforechange = manager::get_scheduled_task(session_cleanup_task::class);
// Edit a task to simulate a change in its definition (as if it was not customised).
$task->set_minute('1');
@@ -233,19 +226,19 @@ class core_scheduled_task_testcase extends advanced_testcase {
$task->set_day('3');
$task->set_month('4');
$task->set_day_of_week('5');
- \core\task\manager::configure_scheduled_task($task);
+ manager::configure_scheduled_task($task);
// Fetch the task out for comparison.
- $taskafterchange = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $taskafterchange = manager::get_scheduled_task(session_cleanup_task::class);
// The task should now be different to the original.
$this->assertTaskNotEquals($taskbeforechange, $taskafterchange);
// Now call reset.
- \core\task\manager::reset_scheduled_tasks_for_component('moodle');
+ manager::reset_scheduled_tasks_for_component('moodle');
// Fetch the task again.
- $taskafterreset = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $taskafterreset = manager::get_scheduled_task(session_cleanup_task::class);
// The task should now be the same as the original.
$this->assertTaskEquals($taskbeforechange, $taskafterreset);
@@ -261,16 +254,16 @@ class core_scheduled_task_testcase extends advanced_testcase {
$count = $DB->count_records('task_scheduled', array('component' => 'moodle'));
$allcount = $DB->count_records('task_scheduled');
- $task = new \core\task\scheduled_test_task();
+ $task = new scheduled_test_task();
$task->set_component('moodle');
- $record = \core\task\manager::record_from_scheduled_task($task);
+ $record = manager::record_from_scheduled_task($task);
$DB->insert_record('task_scheduled', $record);
$this->assertTrue($DB->record_exists('task_scheduled', array('classname' => '\core\task\scheduled_test_task',
'component' => 'moodle')));
- $task = new \core\task\scheduled_test2_task();
+ $task = new scheduled_test2_task();
$task->set_component('moodle');
- $record = \core\task\manager::record_from_scheduled_task($task);
+ $record = manager::record_from_scheduled_task($task);
$DB->insert_record('task_scheduled', $record);
$this->assertTrue($DB->record_exists('task_scheduled', array('classname' => '\core\task\scheduled_test2_task',
'component' => 'moodle')));
@@ -282,7 +275,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
$this->assertEquals($allcount + 2, $afterallcount);
// Now check that the right things were deleted.
- \core\task\manager::reset_scheduled_tasks_for_component('moodle');
+ manager::reset_scheduled_tasks_for_component('moodle');
$this->assertEquals($count, $DB->count_records('task_scheduled', array('component' => 'moodle')));
$this->assertEquals($allcount, $DB->count_records('task_scheduled'));
@@ -301,7 +294,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Add a scheduled task.
// A task that runs once per hour.
- $record = new stdClass();
+ $record = new \stdClass();
$record->blocking = true;
$record->minute = '0';
$record->hour = '0';
@@ -323,30 +316,30 @@ class core_scheduled_task_testcase extends advanced_testcase {
$now = time();
// Should get handed the first task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertInstanceOf('\core\task\scheduled_test_task', $task);
$task->execute();
- \core\task\manager::scheduled_task_complete($task);
+ manager::scheduled_task_complete($task);
// Should get handed the second task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertInstanceOf('\core\task\scheduled_test2_task', $task);
$task->execute();
- \core\task\manager::scheduled_task_failed($task);
+ manager::scheduled_task_failed($task);
// Should not get any task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertNull($task);
// Should get the second task (retry after delay).
- $task = \core\task\manager::get_next_scheduled_task($now + 120);
+ $task = manager::get_next_scheduled_task($now + 120);
$this->assertInstanceOf('\core\task\scheduled_test2_task', $task);
$task->execute();
- \core\task\manager::scheduled_task_complete($task);
+ manager::scheduled_task_complete($task);
// Should not get any task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertNull($task);
// Check ordering.
@@ -361,19 +354,19 @@ class core_scheduled_task_testcase extends advanced_testcase {
$DB->insert_record('task_scheduled', $record);
// Should get handed the second task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertInstanceOf('\core\task\scheduled_test2_task', $task);
$task->execute();
- \core\task\manager::scheduled_task_complete($task);
+ manager::scheduled_task_complete($task);
// Should get handed the first task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertInstanceOf('\core\task\scheduled_test_task', $task);
$task->execute();
- \core\task\manager::scheduled_task_complete($task);
+ manager::scheduled_task_complete($task);
// Should not get any task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertNull($task);
}
@@ -386,7 +379,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Add a scheduled task.
// A broken task that runs all the time.
- $record = new stdClass();
+ $record = new \stdClass();
$record->blocking = true;
$record->minute = '*';
$record->hour = '*';
@@ -400,7 +393,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
$now = time();
// Should not get any task.
- $task = \core\task\manager::get_next_scheduled_task($now);
+ $task = manager::get_next_scheduled_task($now);
$this->assertDebuggingCalled();
$this->assertNull($task);
}
@@ -413,7 +406,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Testing non-deterministic things in a unit test is not really
// wise, so we just test the values have changed within allowed bounds.
- $testclass = new \core\task\scheduled_test_task();
+ $testclass = new scheduled_test_task();
// The test task defaults to '*'.
$this->assertIsString($testclass->get_minute());
@@ -463,7 +456,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
// Change the time modified for the first file, to a time that will be deleted by the task (greater than seven days).
touch($file01, time() - (8 * 24 * 3600));
- $task = \core\task\manager::get_scheduled_task('\\core\\task\\file_temp_cleanup_task');
+ $task = manager::get_scheduled_task('\\core\\task\\file_temp_cleanup_task');
$this->assertInstanceOf('\core\task\file_temp_cleanup_task', $task);
$task->execute();
@@ -517,20 +510,20 @@ class core_scheduled_task_testcase extends advanced_testcase {
$before = time();
$cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
for ($i = 0; $i < 3; $i ++) {
- $task = \core\task\manager::get_scheduled_task($taskname);
+ $task = manager::get_scheduled_task($taskname);
$lock = $cronlockfactory->get_lock('\\' . get_class($task), 10);
$task->set_lock($lock);
- \core\task\manager::scheduled_task_failed($task);
+ manager::scheduled_task_failed($task);
}
// Confirm task is now delayed by several minutes.
- $task = \core\task\manager::get_scheduled_task($taskname);
+ $task = manager::get_scheduled_task($taskname);
$this->assertEquals(240, $task->get_fail_delay());
$this->assertGreaterThan($before + 230, $task->get_next_run_time());
// Clear the fail delay and re-get the task.
- \core\task\manager::clear_fail_delay($task);
- $task = \core\task\manager::get_scheduled_task($taskname);
+ manager::clear_fail_delay($task);
+ $task = manager::get_scheduled_task($taskname);
// There should be no delay and it should run within the next minute.
$this->assertEquals(0, $task->get_fail_delay());
@@ -627,14 +620,14 @@ class core_scheduled_task_testcase extends advanced_testcase {
$CFG->scheduled_tasks = $overrides;
// Set up test scheduled task record.
- $record = new stdClass();
+ $record = new \stdClass();
$record->component = 'test_scheduled_task';
foreach ($tasks as $task) {
$record->classname = $task;
$DB->insert_record('task_scheduled', $record);
- $scheduledtask = \core\task\manager::get_scheduled_task($task);
+ $scheduledtask = manager::get_scheduled_task($task);
$expectedresults = $expected[$task];
// Check that the task is actually overridden.
@@ -682,7 +675,7 @@ class core_scheduled_task_testcase extends advanced_testcase {
];
// A task that runs once per hour.
- $record = new stdClass();
+ $record = new \stdClass();
$record->component = 'test_scheduled_task';
$record->classname = '\core\task\scheduled_test_task';
$record->disabled = 0;
@@ -695,10 +688,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
$now = time();
- $scheduledtask = \core\task\manager::get_next_scheduled_task($now);
+ $scheduledtask = manager::get_next_scheduled_task($now);
$this->assertInstanceOf('\core\task\scheduled_test2_task', $scheduledtask);
$scheduledtask->execute();
- \core\task\manager::scheduled_task_complete($scheduledtask);
+ manager::scheduled_task_complete($scheduledtask);
}
/**
@@ -707,10 +700,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
* @param \core\task\task_base $task
* @param \core\task\task_base $comparisontask
*/
- public function assertTaskEquals(\core\task\task_base $task, \core\task\task_base $comparisontask): void {
+ public function assertTaskEquals(task_base $task, task_base $comparisontask): void {
// Convert both to an object.
- $task = \core\task\manager::record_from_scheduled_task($task);
- $comparisontask = \core\task\manager::record_from_scheduled_task($comparisontask);
+ $task = manager::record_from_scheduled_task($task);
+ $comparisontask = manager::record_from_scheduled_task($comparisontask);
// Reset the nextruntime field as it is intentionally dynamic.
$task->nextruntime = null;
@@ -733,10 +726,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
* @param \core\task\task_base $task
* @param \core\task\task_base $comparisontask
*/
- public function assertTaskNotEquals(\core\task\task_base $task, \core\task\task_base $comparisontask): void {
+ public function assertTaskNotEquals(task_base $task, task_base $comparisontask): void {
// Convert both to an object.
- $task = \core\task\manager::record_from_scheduled_task($task);
- $comparisontask = \core\task\manager::record_from_scheduled_task($comparisontask);
+ $task = manager::record_from_scheduled_task($task);
+ $comparisontask = manager::record_from_scheduled_task($comparisontask);
// Reset the nextruntime field as it is intentionally dynamic.
$task->nextruntime = null;
@@ -764,10 +757,10 @@ class core_scheduled_task_testcase extends advanced_testcase {
$DB->set_field('task_scheduled', 'lastruntime', 123456789, ['classname' => '\core\task\session_cleanup_task']);
// Reset the task.
- \core\task\manager::reset_scheduled_tasks_for_component('moodle');
+ manager::reset_scheduled_tasks_for_component('moodle');
// Fetch the task again.
- $taskafterreset = \core\task\manager::get_scheduled_task(core\task\session_cleanup_task::class);
+ $taskafterreset = manager::get_scheduled_task(session_cleanup_task::class);
// Confirm, that lastruntime is still in place.
$this->assertEquals(123456789, $taskafterreset->get_last_run_time());
diff --git a/lib/tests/update_api_test.php b/lib/tests/update_api_test.php
index 9454ae6844d..504041ce42f 100644
--- a/lib/tests/update_api_test.php
+++ b/lib/tests/update_api_test.php
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Provides core_update_api_testcase class.
- *
- * @package core_plugin
- * @category test
- * @copyright 2015 David Mudrak
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
@@ -36,10 +29,12 @@ require_once(__DIR__.'/fixtures/testable_update_api.php');
* testable_api client perfectly matches the actual behaviour of the live
* services on the given API version.
*
+ * @package core
+ * @category test
* @copyright 2015 David Mudrak
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_update_api_testcase extends advanced_testcase {
+class update_api_test extends \advanced_testcase {
/**
* Make sure the $CFG->branch is mapped correctly to the format used by the API.
diff --git a/lib/tests/update_checker_test.php b/lib/tests/update_checker_test.php
index 53b34b605af..cb3676035f2 100644
--- a/lib/tests/update_checker_test.php
+++ b/lib/tests/update_checker_test.php
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Unit tests for the update checker.
- *
- * @package core_plugin
- * @category test
- * @copyright 2012, 2015 David Mudrak
- * @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/testable_update_checker.php');
/**
* Tests of the basic API of the available update checker.
+ *
+ * @package core
+ * @category test
+ * @copyright 2012, 2015 David Mudrak
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_update_checker_testcase extends advanced_testcase {
+class update_checker_test extends \advanced_testcase {
public function test_core_available_update() {
$provider = testable_checker::instance();
diff --git a/lib/tests/update_code_manager_test.php b/lib/tests/update_code_manager_test.php
index b2972217ae3..3b3a071815f 100644
--- a/lib/tests/update_code_manager_test.php
+++ b/lib/tests/update_code_manager_test.php
@@ -14,14 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Provides core_update_code_manager_testcase class.
- *
- * @package core_plugin
- * @category test
- * @copyright 2015 David Mudrak
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
@@ -31,10 +24,12 @@ require_once(__DIR__.'/fixtures/testable_update_code_manager.php');
/**
* Tests for \core\update\code_manager features.
*
+ * @package core_plugin
+ * @category test
* @copyright 2015 David Mudrak
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_update_code_manager_testcase extends advanced_testcase {
+class update_code_manager_test extends \advanced_testcase {
public function test_get_remote_plugin_zip() {
$codeman = new \core\update\testable_code_manager();
@@ -116,7 +111,7 @@ class core_update_code_manager_testcase extends advanced_testcase {
$zipfilepath = __DIR__.'/fixtures/update_validator/zips/multidir.zip';
$targetdir = make_request_directory();
// Attempting to rename the root folder if there are multiple ones should lead to exception.
- $this->expectException(moodle_exception::class);
+ $this->expectException(\moodle_exception::class);
$files = $codeman->unzip_plugin_file($zipfilepath, $targetdir, 'foo');
}
diff --git a/lib/tests/update_validator_test.php b/lib/tests/update_validator_test.php
index 840a24590b1..a8794282cc7 100644
--- a/lib/tests/update_validator_test.php
+++ b/lib/tests/update_validator_test.php
@@ -14,14 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Provides the unit tests class and some helper classes
- *
- * @package core_plugin
- * @category test
- * @copyright 2013, 2015 David Mudrak
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
+
+use testable_core_update_validator;
defined('MOODLE_INTERNAL') || die();
@@ -30,10 +25,12 @@ require_once(__DIR__.'/fixtures/testable_update_validator.php');
/**
* Unit tests for the {@link \core\update\validator} class
*
+ * @package core
+ * @category test
* @copyright 2013, 2015 David Mudrak
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_update_validator_testcase extends advanced_testcase {
+class update_validator_test extends \advanced_testcase {
public function test_validate_files_layout() {
$fixtures = __DIR__.'/fixtures/update_validator';
diff --git a/lib/tests/upgrade_util_test.php b/lib/tests/upgrade_util_test.php
index 50aa91930b8..a851661bfd2 100644
--- a/lib/tests/upgrade_util_test.php
+++ b/lib/tests/upgrade_util_test.php
@@ -14,13 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Upgrade utility class tests.
- *
- * @package core
- * @copyright 2016 Cameron Ball
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
defined('MOODLE_INTERNAL') || die();
@@ -34,7 +28,7 @@ defined('CURL_SSLVERSION_TLSv1_2') || define('CURL_SSLVERSION_TLSv1_2', 6);
* @copyright 2016 Cameron Ball
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class upgrade_util_testcase extends advanced_testcase {
+class upgrade_util_test extends \advanced_testcase {
/**
* The value of PHP_ZTS when thread safety is enabled.
diff --git a/lib/tests/user_menu_test.php b/lib/tests/user_menu_test.php
index 19bc9c7b92b..13d753c6cf8 100644
--- a/lib/tests/user_menu_test.php
+++ b/lib/tests/user_menu_test.php
@@ -14,6 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
+namespace core;
+
/**
* Tests user menu functionality.
*
@@ -21,7 +23,7 @@
* @copyright 2015 Jetha Chan
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_user_menu_testcase extends advanced_testcase {
+class user_menu_test extends \advanced_testcase {
/**
* Custom user menu data for the test_custom_user_menu test.
diff --git a/lib/tests/user_test.php b/lib/tests/user_test.php
index e93eac3b6af..0fd32723852 100644
--- a/lib/tests/user_test.php
+++ b/lib/tests/user_test.php
@@ -14,13 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-/**
- * Tests core_user class.
- *
- * @package core
- * @copyright 2013 Rajesh Taneja
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+namespace core;
/**
* Test core_user class.
@@ -29,7 +23,7 @@
* @copyright 2013 Rajesh Taneja
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class core_user_testcase extends advanced_testcase {
+class user_test extends \advanced_testcase {
/**
* Setup test data.
@@ -44,45 +38,45 @@ class core_user_testcase extends advanced_testcase {
// Create user and try fetach it with api.
$user = $this->getDataGenerator()->create_user();
- $this->assertEquals($user, core_user::get_user($user->id, '*', MUST_EXIST));
+ $this->assertEquals($user, \core_user::get_user($user->id, '*', MUST_EXIST));
// Test noreply user.
$CFG->noreplyuserid = null;
- $noreplyuser = core_user::get_noreply_user();
+ $noreplyuser = \core_user::get_noreply_user();
$this->assertEquals(1, $noreplyuser->emailstop);
- $this->assertFalse(core_user::is_real_user($noreplyuser->id));
+ $this->assertFalse(\core_user::is_real_user($noreplyuser->id));
$this->assertEquals($CFG->noreplyaddress, $noreplyuser->email);
$this->assertEquals(get_string('noreplyname'), $noreplyuser->firstname);
// Set user as noreply user and make sure noreply propery is set.
- core_user::reset_internal_users();
+ \core_user::reset_internal_users();
$CFG->noreplyuserid = $user->id;
- $noreplyuser = core_user::get_noreply_user();
+ $noreplyuser = \core_user::get_noreply_user();
$this->assertEquals(1, $noreplyuser->emailstop);
- $this->assertTrue(core_user::is_real_user($noreplyuser->id));
+ $this->assertTrue(\core_user::is_real_user($noreplyuser->id));
// Test support user.
- core_user::reset_internal_users();
+ \core_user::reset_internal_users();
$CFG->supportemail = null;
$CFG->noreplyuserid = null;
- $supportuser = core_user::get_support_user();
+ $supportuser = \core_user::get_support_user();
$adminuser = get_admin();
$this->assertEquals($adminuser, $supportuser);
- $this->assertTrue(core_user::is_real_user($supportuser->id));
+ $this->assertTrue(\core_user::is_real_user($supportuser->id));
// When supportemail is set.
- core_user::reset_internal_users();
+ \core_user::reset_internal_users();
$CFG->supportemail = 'test@example.com';
- $supportuser = core_user::get_support_user();
- $this->assertEquals(core_user::SUPPORT_USER, $supportuser->id);
- $this->assertFalse(core_user::is_real_user($supportuser->id));
+ $supportuser = \core_user::get_support_user();
+ $this->assertEquals(\core_user::SUPPORT_USER, $supportuser->id);
+ $this->assertFalse(\core_user::is_real_user($supportuser->id));
// Set user as support user and make sure noreply propery is set.
- core_user::reset_internal_users();
+ \core_user::reset_internal_users();
$CFG->supportuserid = $user->id;
- $supportuser = core_user::get_support_user();
+ $supportuser = \core_user::get_support_user();
$this->assertEquals($user, $supportuser);
- $this->assertTrue(core_user::is_real_user($supportuser->id));
+ $this->assertTrue(\core_user::is_real_user($supportuser->id));
}
/**
@@ -98,23 +92,23 @@ class core_user_testcase extends advanced_testcase {
$userexpected = $this->getDataGenerator()->create_user($record);
// Assert that the returned user is the espected one.
- $this->assertEquals($userexpected, core_user::get_user_by_username('johndoe'));
+ $this->assertEquals($userexpected, \core_user::get_user_by_username('johndoe'));
// Assert that a subset of fields is correctly returned.
- $this->assertEquals((object) $record, core_user::get_user_by_username('johndoe', 'username,email,timecreated'));
+ $this->assertEquals((object) $record, \core_user::get_user_by_username('johndoe', 'username,email,timecreated'));
// Assert that a user with a different mnethostid will no be returned.
- $this->assertFalse(core_user::get_user_by_username('johndoe', 'username,email,timecreated', 2));
+ $this->assertFalse(\core_user::get_user_by_username('johndoe', 'username,email,timecreated', 2));
// Create a new user from a different host.
$record['mnethostid'] = 2;
$userexpected2 = $this->getDataGenerator()->create_user($record);
// Assert that the new user is returned when specified the correct mnethostid.
- $this->assertEquals($userexpected2, core_user::get_user_by_username('johndoe', '*', 2));
+ $this->assertEquals($userexpected2, \core_user::get_user_by_username('johndoe', '*', 2));
// Assert that a user not in the db return false.
- $this->assertFalse(core_user::get_user_by_username('janedoe'));
+ $this->assertFalse(\core_user::get_user_by_username('janedoe'));
}
public function test_search() {
@@ -174,7 +168,7 @@ class core_user_testcase extends advanced_testcase {
// As admin user, try searching for somebody at system level by first name, checking the
// results.
$this->setAdminUser();
- $result = core_user::search('Amelia');
+ $result = \core_user::search('Amelia');
$this->assertCount(1, $result);
// Check some basic fields, and test other fields are present.
@@ -191,22 +185,22 @@ class core_user_testcase extends advanced_testcase {
$this->assertObjectHasAttribute('username', $result[0]);
// Now search by lastname, both names, and partials, case-insensitive.
- $this->assertEquals($result, core_user::search('House'));
- $this->assertEquals($result, core_user::search('Amelia house'));
- $this->assertEquals($result, core_user::search('amelI'));
- $this->assertEquals($result, core_user::search('hoUs'));
- $this->assertEquals($result, core_user::search('Amelia H'));
+ $this->assertEquals($result, \core_user::search('House'));
+ $this->assertEquals($result, \core_user::search('Amelia house'));
+ $this->assertEquals($result, \core_user::search('amelI'));
+ $this->assertEquals($result, \core_user::search('hoUs'));
+ $this->assertEquals($result, \core_user::search('Amelia H'));
// Admin user can also search by email (full or partial).
- $this->assertEquals($result, core_user::search('house@x.x'));
- $this->assertEquals($result, core_user::search('hOuse@'));
+ $this->assertEquals($result, \core_user::search('house@x.x'));
+ $this->assertEquals($result, \core_user::search('hOuse@'));
// What if we just search for A? (They all begin with A except the manager.)
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(7, $result);
// Au gets us Audrey, Austin, and Augustus - in alphabetical order by surname.
- $result = core_user::search('au');
+ $result = \core_user::search('au');
$this->assertCount(3, $result);
$this->assertEquals('Austin', $result[0]->firstname);
$this->assertEquals('Audrey', $result[1]->firstname);
@@ -214,7 +208,7 @@ class core_user_testcase extends advanced_testcase {
// But if we search within course 2 we'll get Audrey and Augustus first.
$course2context = \context_course::instance($course2->id);
- $result = core_user::search('au', $course2context);
+ $result = \core_user::search('au', $course2context);
$this->assertCount(3, $result);
$this->assertEquals('Audrey', $result[0]->firstname);
$this->assertEquals('Augustus', $result[1]->firstname);
@@ -223,69 +217,69 @@ class core_user_testcase extends advanced_testcase {
// Try doing a few searches as manager - we should get the same results and can still
// search by email too.
$this->setUser($manager);
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(7, $result);
- $result = core_user::search('au', $course2context);
+ $result = \core_user::search('au', $course2context);
$this->assertCount(3, $result);
- $result = core_user::search('house@x.x');
+ $result = \core_user::search('house@x.x');
$this->assertCount(1, $result);
// Teacher 1. No site-level permission so can't see users outside the enrolled course.
$this->setUser($teacher1);
- $result = core_user::search('au');
+ $result = \core_user::search('au');
$this->assertCount(1, $result);
$this->assertEquals('Augustus', $result[0]->firstname);
// Can still search by email for that user.
- $result = core_user::search('random@x.x');
+ $result = \core_user::search('random@x.x');
$this->assertCount(1, $result);
// Search everyone - teacher can only see four users (including themself).
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(4, $result);
// Search within course 2 - you get the same four users (which doesn't include
// everyone on that course) but the two on course 2 should be first.
- $result = core_user::search('a', $course2context);
+ $result = \core_user::search('a', $course2context);
$this->assertCount(4, $result);
$this->assertEquals('Amelia', $result[0]->firstname);
$this->assertEquals('Augustus', $result[1]->firstname);
// Other teacher.
$this->setUser($teacher2and3);
- $result = core_user::search('au');
+ $result = \core_user::search('au');
$this->assertCount(3, $result);
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(5, $result);
// Student can only see users on course 3.
$this->setUser($student3);
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(3, $result);
- $result = core_user::search('au');
+ $result = \core_user::search('au');
$this->assertCount(1, $result);
$this->assertEquals('Austin', $result[0]->firstname);
// Student cannot search by email.
- $result = core_user::search('a.bloomsbury@x.x');
+ $result = \core_user::search('a.bloomsbury@x.x');
$this->assertCount(0, $result);
// Student on all courses can see all the A users.
$this->setUser($studentall);
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(7, $result);
// Mixed user can see users on courses 1 and 3.
$this->setUser($mixed);
- $result = core_user::search('a');
+ $result = \core_user::search('a');
$this->assertCount(6, $result);
// Mixed user can search by email for students on course 3 but not on course 1.
- $result = core_user::search('hodder_a@x.x');
+ $result = \core_user::search('hodder_a@x.x');
$this->assertCount(0, $result);
- $result = core_user::search('house@x.x');
+ $result = \core_user::search('house@x.x');
$this->assertCount(1, $result);
}
@@ -304,15 +298,15 @@ class core_user_testcase extends advanced_testcase {
$generator->enrol_user($student->id, $course->id, 'student');
}
$this->setAdminUser();
- $result = core_user::search('Guy');
+ $result = \core_user::search('Guy');
$this->assertCount(30, $result);
// Check a small limit.
- $result = core_user::search('Guy', null, 10);
+ $result = \core_user::search('Guy', null, 10);
$this->assertCount(10, $result);
// Check no limit.
- $result = core_user::search('Guy', null, 0);
+ $result = \core_user::search('Guy', null, 0);
$this->assertCount(31, $result);
}
@@ -350,12 +344,12 @@ class core_user_testcase extends advanced_testcase {
// As searcher, we only find the 2 in the same group.
$this->setUser($searcher);
- $result = core_user::search('Guy');
+ $result = \core_user::search('Guy');
$this->assertCount(2, $result);
// If we change the course to visible groups though, we get the max number.
$DB->set_field('course', 'groupmode', VISIBLEGROUPS, ['id' => $course->id]);
- $result = core_user::search('Guy');
+ $result = \core_user::search('Guy');
$this->assertCount(30, $result);
}
@@ -382,18 +376,18 @@ class core_user_testcase extends advanced_testcase {
// As searcher, we find both users.
$this->setUser($searcher);
- $result = core_user::search('Amelia');
+ $result = \core_user::search('Amelia');
$this->assertCount(2, $result);
// What if one is deleted?
delete_user($student1);
- $result = core_user::search('Amelia');
+ $result = \core_user::search('Amelia');
$this->assertCount(1, $result);
$this->assertEquals('Beetle', $result[0]->lastname);
// Delete the other, for good measure.
delete_user($student2);
- $result = core_user::search('Amelia');
+ $result = \core_user::search('Amelia');
$this->assertCount(0, $result);
}
@@ -425,13 +419,13 @@ class core_user_testcase extends advanced_testcase {
$userexpected = $this->getDataGenerator()->create_user();
// Simple case, all good.
- core_user::require_active_user($userexpected, true, true);
+ \core_user::require_active_user($userexpected, true, true);
// Set user not confirmed.
$DB->set_field('user', 'confirmed', 0, array('id' => $userexpected->id));
try {
- core_user::require_active_user($userexpected);
- } catch (moodle_exception $e) {
+ \core_user::require_active_user($userexpected);
+ } catch (\moodle_exception $e) {
$this->assertEquals('usernotconfirmed', $e->errorcode);
}
$DB->set_field('user', 'confirmed', 1, array('id' => $userexpected->id));
@@ -439,45 +433,45 @@ class core_user_testcase extends advanced_testcase {
// Set nologin auth method.
$DB->set_field('user', 'auth', 'nologin', array('id' => $userexpected->id));
try {
- core_user::require_active_user($userexpected, false, true);
- } catch (moodle_exception $e) {
+ \core_user::require_active_user($userexpected, false, true);
+ } catch (\moodle_exception $e) {
$this->assertEquals('suspended', $e->errorcode);
}
// Check no exceptions are thrown if we don't specify to check suspended.
- core_user::require_active_user($userexpected);
+ \core_user::require_active_user($userexpected);
$DB->set_field('user', 'auth', 'manual', array('id' => $userexpected->id));
// Set user suspended.
$DB->set_field('user', 'suspended', 1, array('id' => $userexpected->id));
try {
- core_user::require_active_user($userexpected, true);
- } catch (moodle_exception $e) {
+ \core_user::require_active_user($userexpected, true);
+ } catch (\moodle_exception $e) {
$this->assertEquals('suspended', $e->errorcode);
}
// Check no exceptions are thrown if we don't specify to check suspended.
- core_user::require_active_user($userexpected);
+ \core_user::require_active_user($userexpected);
// Delete user.
delete_user($userexpected);
try {
- core_user::require_active_user($userexpected);
- } catch (moodle_exception $e) {
+ \core_user::require_active_user($userexpected);
+ } catch (\moodle_exception $e) {
$this->assertEquals('userdeleted', $e->errorcode);
}
// Use a not real user.
- $noreplyuser = core_user::get_noreply_user();
+ $noreplyuser = \core_user::get_noreply_user();
try {
- core_user::require_active_user($noreplyuser, true);
- } catch (moodle_exception $e) {
+ \core_user::require_active_user($noreplyuser, true);
+ } catch (\moodle_exception $e) {
$this->assertEquals('invaliduser', $e->errorcode);
}
// Get the guest user.
$guestuser = $DB->get_record('user', array('username' => 'guest'));
try {
- core_user::require_active_user($guestuser, true);
- } catch (moodle_exception $e) {
+ \core_user::require_active_user($guestuser, true);
+ } catch (\moodle_exception $e) {
$this->assertEquals('guestsarenotallowed', $e->errorcode);
}
@@ -488,22 +482,22 @@ class core_user_testcase extends advanced_testcase {
*/
public function test_get_property_definition() {
// Try to get a existing property.
- $properties = core_user::get_property_definition('id');
+ $properties = \core_user::get_property_definition('id');
$this->assertEquals($properties['type'], PARAM_INT);
- $properties = core_user::get_property_definition('username');
+ $properties = \core_user::get_property_definition('username');
$this->assertEquals($properties['type'], PARAM_USERNAME);
// Invalid property.
try {
- core_user::get_property_definition('fullname');
- } catch (coding_exception $e) {
+ \core_user::get_property_definition('fullname');
+ } catch (\coding_exception $e) {
$this->assertMatchesRegularExpression('/Invalid property requested./', $e->getMessage());
}
// Empty parameter.
try {
- core_user::get_property_definition('');
- } catch (coding_exception $e) {
+ \core_user::get_property_definition('');
+ } catch (\coding_exception $e) {
$this->assertMatchesRegularExpression('/Invalid property requested./', $e->getMessage());
}
}
@@ -515,7 +509,7 @@ class core_user_testcase extends advanced_testcase {
// Create user with just with username and firstname.
$record = array('username' => 's10', 'firstname' => 'Bebe Stevens');
- $validation = core_user::validate((object)$record);
+ $validation = \core_user::validate((object)$record);
// Validate the user, should return true as the user data is correct.
$this->assertTrue($validation);
@@ -524,7 +518,7 @@ class core_user_testcase extends advanced_testcase {
$record = array('username' => 's1', 'firstname' => 'Eric Cartman', 'country' => 'UU', 'theme' => 'beise');
// Should return an array with 2 errors.
- $validation = core_user::validate((object)$record);
+ $validation = \core_user::validate((object)$record);
$this->assertArrayHasKey('country', $validation);
$this->assertArrayHasKey('theme', $validation);
$this->assertCount(2, $validation);
@@ -533,7 +527,7 @@ class core_user_testcase extends advanced_testcase {
$record = array('username' => 's3', 'firstname' => 'Kyle Doe';
$user->username = 'john%#&~%*_doe';
$user->email = ' john@testing.com ';
$user->deleted = 'no';
$user->description = 'A description about myself.';
- $usercleaned = core_user::clean_data($user);
+ $usercleaned = \core_user::clean_data($user);
// Expected results.
$this->assertEquals('John alert(1) Doe', $usercleaned->firstname);
@@ -561,7 +555,7 @@ class core_user_testcase extends advanced_testcase {
// Try to clean an invalid property (userfullname).
$user->userfullname = 'John Doe';
- core_user::clean_data($user);
+ \core_user::clean_data($user);
$this->assertDebuggingCalled("The property 'userfullname' could not be cleaned.");
}
@@ -571,7 +565,7 @@ class core_user_testcase extends advanced_testcase {
public function test_clean_field() {
// Create a 'malicious' user object/
- $user = new stdClass();
+ $user = new \stdClass();
$user->firstname = 'John Doe';
$user->username = 'john%#&~%*_doe';
$user->email = ' john@testing.com ';
@@ -580,14 +574,14 @@ class core_user_testcase extends advanced_testcase {
$user->userfullname = 'John Doe';
// Expected results.
- $this->assertEquals('John alert(1) Doe', core_user::clean_field($user->firstname, 'firstname'));
- $this->assertEquals('john_doe', core_user::clean_field($user->username, 'username'));
- $this->assertEquals('john@testing.com', core_user::clean_field($user->email, 'email'));
- $this->assertEquals(0, core_user::clean_field($user->deleted, 'deleted'));
- $this->assertEquals('A description about myself.', core_user::clean_field($user->description, 'description'));
+ $this->assertEquals('John alert(1) Doe', \core_user::clean_field($user->firstname, 'firstname'));
+ $this->assertEquals('john_doe', \core_user::clean_field($user->username, 'username'));
+ $this->assertEquals('john@testing.com', \core_user::clean_field($user->email, 'email'));
+ $this->assertEquals(0, \core_user::clean_field($user->deleted, 'deleted'));
+ $this->assertEquals('A description about myself.', \core_user::clean_field($user->description, 'description'));
// Try to clean an invalid property (fullname).
- core_user::clean_field($user->userfullname, 'fullname');
+ \core_user::clean_field($user->userfullname, 'fullname');
$this->assertDebuggingCalled("The property 'fullname' could not be cleaned.");
}
@@ -597,21 +591,21 @@ class core_user_testcase extends advanced_testcase {
public function test_get_property_type() {
// Fetch valid properties and verify if the type is correct.
- $type = core_user::get_property_type('username');
+ $type = \core_user::get_property_type('username');
$this->assertEquals(PARAM_USERNAME, $type);
- $type = core_user::get_property_type('email');
+ $type = \core_user::get_property_type('email');
$this->assertEquals(PARAM_RAW_TRIMMED, $type);
- $type = core_user::get_property_type('timezone');
+ $type = \core_user::get_property_type('timezone');
$this->assertEquals(PARAM_TIMEZONE, $type);
// Try to fetch type of a non-existent properties.
$nonexistingproperty = 'userfullname';
$this->expectException('coding_exception');
$this->expectExceptionMessage('Invalid property requested: ' . $nonexistingproperty);
- core_user::get_property_type($nonexistingproperty);
+ \core_user::get_property_type($nonexistingproperty);
$nonexistingproperty = 'mobilenumber';
$this->expectExceptionMessage('Invalid property requested: ' . $nonexistingproperty);
- core_user::get_property_type($nonexistingproperty);
+ \core_user::get_property_type($nonexistingproperty);
}
/**
@@ -619,23 +613,23 @@ class core_user_testcase extends advanced_testcase {
*/
public function test_get_property_null() {
// Fetch valid properties and verify if it is NULL_ALLOWED or NULL_NOT_ALLOWED.
- $property = core_user::get_property_null('username');
+ $property = \core_user::get_property_null('username');
$this->assertEquals(NULL_NOT_ALLOWED, $property);
- $property = core_user::get_property_null('password');
+ $property = \core_user::get_property_null('password');
$this->assertEquals(NULL_NOT_ALLOWED, $property);
- $property = core_user::get_property_null('imagealt');
+ $property = \core_user::get_property_null('imagealt');
$this->assertEquals(NULL_ALLOWED, $property);
- $property = core_user::get_property_null('middlename');
+ $property = \core_user::get_property_null('middlename');
$this->assertEquals(NULL_ALLOWED, $property);
// Try to fetch type of a non-existent properties.
$nonexistingproperty = 'lastnamefonetic';
$this->expectException('coding_exception');
$this->expectExceptionMessage('Invalid property requested: ' . $nonexistingproperty);
- core_user::get_property_null($nonexistingproperty);
+ \core_user::get_property_null($nonexistingproperty);
$nonexistingproperty = 'midlename';
$this->expectExceptionMessage('Invalid property requested: ' . $nonexistingproperty);
- core_user::get_property_null($nonexistingproperty);
+ \core_user::get_property_null($nonexistingproperty);
}
/**
@@ -644,20 +638,20 @@ class core_user_testcase extends advanced_testcase {
public function test_get_property_choices() {
// Test against country property choices.
- $choices = core_user::get_property_choices('country');
+ $choices = \core_user::get_property_choices('country');
$this->assertArrayHasKey('AU', $choices);
$this->assertArrayHasKey('BR', $choices);
$this->assertArrayNotHasKey('WW', $choices);
$this->assertArrayNotHasKey('TX', $choices);
// Test against lang property choices.
- $choices = core_user::get_property_choices('lang');
+ $choices = \core_user::get_property_choices('lang');
$this->assertArrayHasKey('en', $choices);
$this->assertArrayNotHasKey('ww', $choices);
$this->assertArrayNotHasKey('yy', $choices);
// Test against theme property choices.
- $choices = core_user::get_property_choices('theme');
+ $choices = \core_user::get_property_choices('theme');
$this->assertArrayHasKey('boost', $choices);
$this->assertArrayHasKey('classic', $choices);
$this->assertArrayNotHasKey('unknowntheme', $choices);
@@ -667,10 +661,10 @@ class core_user_testcase extends advanced_testcase {
$nonexistingproperty = 'language';
$this->expectException('coding_exception');
$this->expectExceptionMessage('Invalid property requested: ' . $nonexistingproperty);
- core_user::get_property_null($nonexistingproperty);
+ \core_user::get_property_null($nonexistingproperty);
$nonexistingproperty = 'coutries';
$this->expectExceptionMessage('Invalid property requested: ' . $nonexistingproperty);
- core_user::get_property_null($nonexistingproperty);
+ \core_user::get_property_null($nonexistingproperty);
}
/**
@@ -680,31 +674,31 @@ class core_user_testcase extends advanced_testcase {
global $CFG;
$this->resetAfterTest();
- $country = core_user::get_property_default('country');
+ $country = \core_user::get_property_default('country');
$this->assertEquals($CFG->country, $country);
set_config('country', 'AU');
- core_user::reset_caches();
- $country = core_user::get_property_default('country');
+ \core_user::reset_caches();
+ $country = \core_user::get_property_default('country');
$this->assertEquals($CFG->country, $country);
- $lang = core_user::get_property_default('lang');
+ $lang = \core_user::get_property_default('lang');
$this->assertEquals($CFG->lang, $lang);
set_config('lang', 'en');
- $lang = core_user::get_property_default('lang');
+ $lang = \core_user::get_property_default('lang');
$this->assertEquals($CFG->lang, $lang);
$this->setTimezone('Europe/London', 'Pacific/Auckland');
- core_user::reset_caches();
- $timezone = core_user::get_property_default('timezone');
+ \core_user::reset_caches();
+ $timezone = \core_user::get_property_default('timezone');
$this->assertEquals('Europe/London', $timezone);
$this->setTimezone('99', 'Pacific/Auckland');
- core_user::reset_caches();
- $timezone = core_user::get_property_default('timezone');
+ \core_user::reset_caches();
+ $timezone = \core_user::get_property_default('timezone');
$this->assertEquals('Pacific/Auckland', $timezone);
- $this->expectException(coding_exception::class);
+ $this->expectException(\coding_exception::class);
$this->expectExceptionMessage('Invalid property requested, or the property does not has a default value.');
- core_user::get_property_default('firstname');
+ \core_user::get_property_default('firstname');
}
/**
@@ -762,12 +756,12 @@ class core_user_testcase extends advanced_testcase {
// Fake accounts are not real users.
$CFG->noreplyuserid = null;
- $this->assertFalse(\core_user::is_real_user(core_user::get_noreply_user()->id));
- $this->assertFalse(\core_user::is_real_user(core_user::get_noreply_user()->id, true));
+ $this->assertFalse(\core_user::is_real_user(\core_user::get_noreply_user()->id));
+ $this->assertFalse(\core_user::is_real_user(\core_user::get_noreply_user()->id, true));
$CFG->supportuserid = null;
$CFG->supportemail = 'test@example.com';
- $this->assertFalse(\core_user::is_real_user(core_user::get_support_user()->id));
- $this->assertFalse(\core_user::is_real_user(core_user::get_support_user()->id, true));
+ $this->assertFalse(\core_user::is_real_user(\core_user::get_support_user()->id));
+ $this->assertFalse(\core_user::is_real_user(\core_user::get_support_user()->id, true));
}
}