MDL-43736 Events: Updated unit test to test context not used in event

This commit is contained in:
Rajesh Taneja 2014-01-21 17:04:37 +08:00
parent fdc729ea57
commit 623a32e50d
36 changed files with 210 additions and 13 deletions

View File

@ -113,6 +113,7 @@ class block_comments_events_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/wiki/view.php', array('id' => $this->wiki->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
/**
@ -178,5 +179,6 @@ class block_comments_events_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/wiki/view.php', array('id' => $this->wiki->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
}

View File

@ -183,6 +183,7 @@ class core_bloglib_testcase extends advanced_testcase {
$this->assertEventLegacyLogData($arr, $event);
$this->assertEquals("blog_entry_added", $event->get_legacy_eventname());
$this->assertEventLegacyData($blog, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -215,6 +216,7 @@ class core_bloglib_testcase extends advanced_testcase {
$this->assertEventLegacyData($blog, $event);
$arr = array (SITEID, 'blog', 'update', 'index.php?userid=' . $this->userid . '&entryid=' . $blog->id, $blog->subject);
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -249,6 +251,7 @@ class core_bloglib_testcase extends advanced_testcase {
$blog->id);
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventLegacyData($blog, $event);
$this->assertEventContextNotUsed($event);
}
@ -301,6 +304,7 @@ class core_bloglib_testcase extends advanced_testcase {
$arr = array(SITEID, 'blog', 'add association', 'index.php?userid=' . $this->userid . '&entryid=' . $blog->id,
$blog->subject, $this->cmid, $this->userid);
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -381,6 +385,7 @@ class core_bloglib_testcase extends advanced_testcase {
$this->assertEquals($url, $event->get_url());
$arr = array(SITEID, 'blog', 'view', $url2->out(), 'view blog entry');
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -416,6 +421,7 @@ class core_bloglib_testcase extends advanced_testcase {
$this->assertEquals($this->postid, $event->other['itemid']);
$url = new moodle_url('/blog/index.php', array('entryid' => $this->postid));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
/**
@ -452,6 +458,7 @@ class core_bloglib_testcase extends advanced_testcase {
$this->assertEquals($this->postid, $event->other['itemid']);
$url = new moodle_url('/blog/index.php', array('entryid' => $this->postid));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
}

View File

@ -106,6 +106,7 @@ class core_cohort_cohortlib_testcase extends advanced_testcase {
$this->assertEquals($cohort->contextid, $event->contextid);
$this->assertEquals($cohort, $event->get_record_snapshot('cohort', $id));
$this->assertEventLegacyData($cohort, $event);
$this->assertEventContextNotUsed($event);
}
public function test_cohort_update_cohort() {
@ -176,6 +177,7 @@ class core_cohort_cohortlib_testcase extends advanced_testcase {
$this->assertEquals($updatedcohort->contextid, $event->contextid);
$this->assertEquals($cohort, $event->get_record_snapshot('cohort', $id));
$this->assertEventLegacyData($cohort, $event);
$this->assertEventContextNotUsed($event);
}
public function test_cohort_delete_cohort() {
@ -213,6 +215,7 @@ class core_cohort_cohortlib_testcase extends advanced_testcase {
$this->assertEquals($cohort->id, $event->objectid);
$this->assertEquals($cohort, $event->get_record_snapshot('cohort', $cohort->id));
$this->assertEventLegacyData($cohort, $event);
$this->assertEventContextNotUsed($event);
}
public function test_cohort_delete_category() {
@ -270,6 +273,7 @@ class core_cohort_cohortlib_testcase extends advanced_testcase {
$this->assertEquals($user->id, $event->relateduserid);
$this->assertEquals($USER->id, $event->userid);
$this->assertEventLegacyData((object) array('cohortid' => $cohort->id, 'userid' => $user->id), $event);
$this->assertEventContextNotUsed($event);
}
public function test_cohort_remove_member() {
@ -313,6 +317,7 @@ class core_cohort_cohortlib_testcase extends advanced_testcase {
$this->assertEquals($user->id, $event->relateduserid);
$this->assertEquals($USER->id, $event->userid);
$this->assertEventLegacyData((object) array('cohortid' => $cohort->id, 'userid' => $user->id), $event);
$this->assertEventContextNotUsed($event);
}
public function test_cohort_is_member() {

View File

@ -1449,6 +1449,7 @@ class core_course_courselib_testcase extends advanced_testcase {
// as they have already been validated in the previous steps. Here we only want to make sure that when the
// imsenterprise plugin creates a course an event is triggered.
$this->assertInstanceOf('\core\event\course_created', $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -1527,6 +1528,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertEventLegacyData($movedcoursehidden, $event);
$expectedlog = array($movedcoursehidden->id, 'course', 'move', 'edit.php?id=' . $movedcoursehidden->id, $movedcoursehidden->id);
$this->assertEventLegacyLogData($expectedlog, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -1572,6 +1574,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertEventLegacyData($course, $event);
$expectedlog = array(SITEID, 'course', 'delete', 'view.php?id=' . $course->id, $course->fullname . '(ID ' . $course->id . ')');
$this->assertEventLegacyLogData($expectedlog, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -1613,6 +1616,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$course->context = $coursecontext;
$course->options = array();
$this->assertEventLegacyData($course, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -1675,6 +1679,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertEventLegacyData($category2, $event);
$expectedlog = array(SITEID, 'category', 'delete', 'index.php', $category2->name . '(ID ' . $category2->id . ')');
$this->assertEventLegacyLogData($expectedlog, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -1740,6 +1745,7 @@ class core_course_courselib_testcase extends advanced_testcase {
'samesite' => $rc->is_samesite()
);
$this->assertEventLegacyData($legacydata, $event);
$this->assertEventContextNotUsed($event);
// Destroy the resource controller since we are done using it.
$rc->destroy();
@ -1794,6 +1800,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$sectionnum = $section->section;
$expectedlegacydata = array($course->id, "course", "editsection", 'editsection.php?id=' . $id, $sectionnum);
$this->assertEventLegacyLogData($expectedlegacydata, $event);
$this->assertEventContextNotUsed($event);
}
public function test_course_integrity_check() {
@ -1953,6 +1960,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$arr = array($cm->course, "course", "add mod", "../mod/assign/view.php?id=$mod->id", "assign $cm->instance");
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
@ -2058,7 +2066,7 @@ class core_course_courselib_testcase extends advanced_testcase {
$arr = array($cm->course, "course", "update mod", "../mod/forum/view.php?id=$mod->id", "forum $cm->instance");
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
/**

View File

@ -474,6 +474,7 @@ class enrol_meta_plugin_testcase extends advanced_testcase {
$expectedlegacyeventdata->enrol = 'meta';
$expectedlegacyeventdata->courseid = $course2->id;
$this->assertEventLegacyData($expectedlegacyeventdata, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -507,6 +508,7 @@ class enrol_meta_plugin_testcase extends advanced_testcase {
$this->assertEquals(0, $DB->count_records('user_enrolments'));
$this->assertInstanceOf('\core\event\user_enrolment_deleted', $event);
$this->assertEquals('user_unenrolled', $event->get_legacy_eventname());
$this->assertEventContextNotUsed($event);
}
/**
@ -546,5 +548,6 @@ class enrol_meta_plugin_testcase extends advanced_testcase {
$expectedlegacyeventdata->enrol = 'meta';
$expectedlegacyeventdata->courseid = $course2->id;
$this->assertEventLegacyData($expectedlegacyeventdata, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -318,6 +318,7 @@ class core_enrollib_testcase extends advanced_testcase {
$this->assertEventLegacyData($expectedlegacyeventdata, $event);
$expected = array($course1->id, 'course', 'enrol', '../enrol/users.php?id=' . $course1->id, $course1->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -359,5 +360,6 @@ class core_enrollib_testcase extends advanced_testcase {
$this->assertEventLegacyData($expectedlegacyeventdata, $event);
$expected = array($course->id, 'course', 'unenrol', '../enrol/users.php?id=' . $course->id, $course->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -343,6 +343,34 @@ abstract class advanced_testcase extends PHPUnit_Framework_TestCase {
$this->assertEquals($expected, $legacydata, $message);
}
/**
* Assert that an event is not using event->contxet.
* While restoring context might not be valid and it should not be used by event url
* or description methods.
*
* @param \core\event\base $event the event object.
* @param string $message
* @return void
*/
public function assertEventContextNotUsed(\core\event\base $event, $message = '') {
// Save current event->context and set it to false.
$eventcontext = phpunit_event_mock::testable_get_event_context($event);
phpunit_event_mock::testable_set_event_context($event, false);
if ($message === '') {
$message = 'Event should not use context property of event in any method.';
}
// Test event methods should not use event->context.
$event->get_url();
$event->get_description();
$event->get_legacy_eventname();
phpunit_event_mock::testable_get_legacy_eventdata($event);
phpunit_event_mock::testable_get_legacy_logdata($event);
// Restore event->context.
phpunit_event_mock::testable_set_event_context($event, $eventcontext);
}
/**
* Stores current time as the base for assertTimeCurrent().
*

View File

@ -37,6 +37,8 @@ abstract class phpunit_event_mock extends \core\event\base {
/**
* Returns the log data of the event.
*
* @param \core\event\base $event event to get legacy eventdata from.
* @return array
*/
public static function testable_get_legacy_eventdata($event) {
@ -45,10 +47,31 @@ abstract class phpunit_event_mock extends \core\event\base {
/**
* Returns the log data of the event.
*
* @param \core\event\base $event event to get legacy logdata from.
* @return array
*/
public static function testable_get_legacy_logdata($event) {
return $event->get_legacy_logdata();
}
/**
* Returns event context.
*
* @param \core\event\base $event event to get context for.
* @return context event context
*/
public static function testable_get_event_context($event) {
return $event->context;
}
/**
* Sets event context.
*
* @param \core\event\base $event event to set context for.
* @param context $context context to set.
*/
public static function testable_set_event_context($event, $context) {
$event->context = $context;
}
}

View File

@ -75,6 +75,7 @@ class core_event_content_viewed_testcase extends advanced_testcase {
$result = $sink->get_events();
$event = $result[1];
$this->assertEventLegacyLogData(null, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -89,6 +90,7 @@ class core_event_content_viewed_testcase extends advanced_testcase {
$pageevent = \core_tests\event\content_viewed::create();
$pageevent->set_page_detail();
$pageevent->trigger();
$this->assertEventContextNotUsed($pageevent);
}
}

View File

@ -57,6 +57,7 @@ class core_event_course_module_instance_list_viewed_testcase extends advanced_te
$this->assertEventLegacyLogData($legacydata, $event);
$url = new moodle_url('/mod/unittests/index.php', array('id' => $course->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}

View File

@ -64,6 +64,7 @@ class core_event_course_module_viewed_testcase extends advanced_testcase {
$this->assertSame('feedback', $event->objecttable);
$url = new moodle_url('/mod/feedback/view.php', array('id' => $cm->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}

View File

@ -749,4 +749,16 @@ class core_event_testcase extends advanced_testcase {
$this->assertSame($event->get_data(), $data);
}
/**
* @expectedException PHPUnit_Framework_Error_Notice
*/
public function test_context_not_used() {
$event = \core_tests\event\context_used_in_event::create(array('courseid' => 1, 'other' => array('sample' => 1, 'xx' => 10)));
$this->assertEventContextNotUsed($event);
$eventcontext = phpunit_event_mock::testable_get_event_context($event);
phpunit_event_mock::testable_set_event_context($event, null);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -51,6 +51,7 @@ class core_events_testcase extends advanced_testcase {
$this->assertEquals(context_coursecat::instance($category->id), $event->get_context());
$expected = array(SITEID, 'category', 'add', 'editcategory.php?id=' . $category->id, $category->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -139,6 +140,7 @@ class core_events_testcase extends advanced_testcase {
$this->assertEquals(context_coursecat::instance($category2->id), $event->get_context());
$expected = array(SITEID, 'category', 'show', 'editcategory.php?id=' . $category2->id, $category2->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -170,5 +172,6 @@ class core_events_testcase extends advanced_testcase {
$this->assertEquals(context_system::instance(), $event->get_context());
$expected = array(SITEID, 'library', 'mailer', qualified_me(), 'ERROR: The email failed to send!');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -258,3 +258,29 @@ class course_module_viewed extends \core\event\course_module_viewed {
class course_module_viewed_noinit extends \core\event\course_module_viewed {
}
/**
* Event to test context used in event functions
*/
class context_used_in_event extends \core\event\base {
public function get_description() {
return $this->context->instanceid . " Description";
}
protected function init() {
$this->data['crud'] = 'u';
$this->data['edulevel'] = self::LEVEL_PARTICIPATING;
$this->context = \context_system::instance();
}
public function get_url() {
return new \moodle_url('/somepath/somefile.php', array('id' => $this->context->instanceid));
}
protected function get_legacy_eventdata() {
return array($this->data['courseid'], $this->context->instanceid);
}
protected function get_legacy_logdata() {
return array($this->data['courseid'], 'core_unittest', 'view', 'unittest.php?id=' . $this->context->instanceid);
}
}

View File

@ -1889,6 +1889,7 @@ class core_moodlelib_testcase extends advanced_testcase {
$this->assertSame($eventdata['other']['picture'], $user->picture);
$this->assertSame($eventdata['other']['mnethostid'], $user->mnethostid);
$this->assertEquals($user, $event->get_record_snapshot('user', $event->objectid));
$this->assertEventContextNotUsed($event);
// Try invalid params.
$record = new stdClass();
@ -2459,6 +2460,7 @@ class core_moodlelib_testcase extends advanced_testcase {
$this->assertEquals('user', $event->objecttable);
$this->assertEquals($user->id, $event->objectid);
$this->assertEquals(context_system::instance()->id, $event->contextid);
$this->assertEventContextNotUsed($event);
$user = $DB->get_record('user', array('id'=>$user->id));
@ -2504,6 +2506,7 @@ class core_moodlelib_testcase extends advanced_testcase {
$expectedlogdata = array(SITEID, 'user', 'logout', 'view.php?id='.$event->objectid.'&course='.SITEID, $event->objectid, 0,
$event->objectid);
$this->assertEventLegacyLogData($expectedlogdata, $event);
$this->assertEventContextNotUsed($event);
}
public function test_email_to_user() {
@ -2586,6 +2589,7 @@ class core_moodlelib_testcase extends advanced_testcase {
$this->assertEquals(context_user::instance($user->id), $event->get_context());
$expectedlogdata = array(SITEID, 'user', 'update', 'view.php?id='.$user->id, '');
$this->assertEventLegacyLogData($expectedlogdata, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -75,6 +75,7 @@ class assignsubmission_comments_events_testcase extends mod_assign_base_testcase
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/assign/view.php', array('id' => $submission->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
/**
@ -112,5 +113,6 @@ class assignsubmission_comments_events_testcase extends mod_assign_base_testcase
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/assign/view.php', array('id' => $submission->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
}

View File

@ -90,6 +90,7 @@ class assignsubmission_file_events_testcase extends advanced_testcase {
$expected->files = $files;
$expected->pathnamehashes = array($fi->get_pathnamehash(), $fi2->get_pathnamehash());
$this->assertEventLegacyData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -70,6 +70,7 @@ class assignsubmission_onlinetext_events_testcase extends advanced_testcase {
$expected->userid = $user->id;
$expected->content = 'Submission text';
$this->assertEventLegacyData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -70,6 +70,7 @@ class mod_book_events_testcase extends advanced_testcase {
$expected = array($course->id, 'book', 'add chapter', 'view.php?id='.$book->cmid.'&chapterid='.$chapter->id,
$chapter->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_chapter_updated() {
@ -102,6 +103,7 @@ class mod_book_events_testcase extends advanced_testcase {
$expected = array($course->id, 'book', 'update chapter', 'view.php?id='.$book->cmid.'&chapterid='.$chapter->id,
$chapter->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_chapter_deleted() {
@ -135,6 +137,7 @@ class mod_book_events_testcase extends advanced_testcase {
$this->assertEquals($chapter->id, $event->objectid);
$this->assertEquals($chapter, $event->get_record_snapshot('book_chapters', $chapter->id));
$this->assertEventLegacyLogData(array('1', 2, false), $event);
$this->assertEventContextNotUsed($event);
}
public function test_course_module_instance_list_viewed() {
@ -159,6 +162,7 @@ class mod_book_events_testcase extends advanced_testcase {
$this->assertEquals(context_course::instance($course->id), $event->get_context());
$expected = array($course->id, 'book', 'view all', 'index.php?id='.$course->id, '');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_course_module_viewed() {
@ -187,6 +191,7 @@ class mod_book_events_testcase extends advanced_testcase {
$this->assertEquals($book->id, $event->objectid);
$expected = array($course->id, 'book', 'view', 'view.php?id=' . $book->cmid, $book->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_chapter_viewed() {
@ -219,6 +224,7 @@ class mod_book_events_testcase extends advanced_testcase {
$expected = array($course->id, 'book', 'view chapter', 'view.php?id=' . $book->cmid . '&chapterid=' .
$chapter->id, $chapter->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -67,6 +67,7 @@ class booktool_exportimscp_events_testcase extends advanced_testcase {
$expected = array($course->id, 'book', 'exportimscp', 'tool/exportimscp/index.php?id=' . $book->cmid,
$book->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -70,6 +70,7 @@ class booktool_importhtml_locallib_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$chapter = $event->get_record_snapshot('book_chapters', $event->objectid);
$this->assertNotEmpty($chapter);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -66,6 +66,7 @@ class booktool_print_events_testcase extends advanced_testcase {
$this->assertEquals($book->id, $event->objectid);
$expected = array($course->id, 'book', 'print', 'tool/print/index.php?id=' . $book->cmid, $book->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
@ -98,6 +99,7 @@ class booktool_print_events_testcase extends advanced_testcase {
$expected = array($course->id, 'book', 'print chapter', 'tool/print/index.php?id=' . $book->cmid .
'&chapterid=' . $chapter->id, $chapter->id, $book->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -89,6 +89,7 @@ class mod_chat_events_testcase extends advanced_testcase {
$this->assertEquals($user2->id, $event->userid);
$expected = array($course->id, 'chat', 'talk', "view.php?id=$cm->id", $chat->id, $cm->id, $user2->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
// Sending a message from the system should not trigger any event.
$sink->clear();
@ -132,6 +133,7 @@ class mod_chat_events_testcase extends advanced_testcase {
$this->assertEquals($chat, $event->get_record_snapshot('chat', $chat->id));
$expected = array($course->id, 'chat', 'report', "report.php?id=$chat->cmid", $chat->id, $chat->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_course_module_instance_list_viewed() {
@ -156,6 +158,7 @@ class mod_chat_events_testcase extends advanced_testcase {
$this->assertEquals(context_course::instance($course->id), $event->get_context());
$expected = array($course->id, 'chat', 'view all', "index.php?id=$course->id", '');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -48,14 +48,7 @@ class mod_choice_events_testcase extends advanced_testcase {
protected $context;
/**
* Setup
* often
* used
* objects
* for
* the
* following
* tests.
* Setup often used objects for the following tests.
*/
protected function setup() {
global $DB;
@ -65,7 +58,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$this->course = $this->getDataGenerator()->create_course();
$this->choice = $this->getDataGenerator()->create_module('choice', array('course' => $this->course->id));
$this->cm = $DB->get_record('course_modules', array('id' => $this->choice->cmid));
$this->context = context_module::instance($this->choice->id);
$this->context = context_module::instance($this->choice->cmid);
}
/**
@ -89,6 +82,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$this->assertEquals(3, $events[0]->other['optionid']);
$expected = array($this->course->id, "choice", "choose", 'view.php?id=' . $this->cm->id, $this->choice->id, $this->cm->id);
$this->assertEventLegacyLogData($expected, $events[0]);
$this->assertEventContextNotUsed($events[0]);
$sink->close();
}
@ -110,6 +104,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$this->setExpectedException('coding_exception');
$event = \mod_choice\event\answer_submitted::create($eventdata);
$event->trigger();
$this->assertEventContextNotUsed($event);
}
/**
@ -139,6 +134,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$expected = array($this->course->id, "choice", "choose again", 'view.php?id=' . $this->cm->id,
$this->choice->id, $this->cm->id);
$this->assertEventLegacyLogData($expected, $events[0]);
$this->assertEventContextNotUsed($events[0]);
$sink->close();
}
@ -161,6 +157,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$this->setExpectedException('coding_exception');
$event = \mod_choice\event\answer_updated::create($eventdata);
$event->trigger();
$this->assertEventContextNotUsed($event);
}
/**
@ -196,6 +193,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$expected = array($this->course->id, "choice", "report", 'report.php?id=' . $this->context->instanceid,
$this->choice->id, $this->context->instanceid);
$this->assertEventLegacyLogData($expected, $event[0]);
$this->assertEventContextNotUsed($event[0]);
$sink->close();
}
@ -230,6 +228,7 @@ class mod_choice_events_testcase extends advanced_testcase {
$expected = array($this->course->id, "choice", "view", 'view.php?id=' . $this->context->instanceid,
$this->choice->id, $this->context->instanceid);
$this->assertEventLegacyLogData($expected, $event[0]);
$this->assertEventContextNotUsed($event[0]);
$sink->close();
}
@ -254,5 +253,6 @@ class mod_choice_events_testcase extends advanced_testcase {
$this->assertEquals(context_course::instance($this->course->id), $event->get_context());
$expected = array($this->course->id, 'choice', 'view all', 'index.php?id=' . $this->course->id, '');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -165,6 +165,7 @@ class data_lib_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/data/view.php', array('id' => $module->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
/**
@ -228,5 +229,6 @@ class data_lib_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/data/view.php', array('id' => $module->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
}

View File

@ -164,6 +164,7 @@ class mod_feedback_events_testcase extends advanced_testcase {
$this->assertTrue($event->can_view());
$this->setAdminUser();
$this->assertTrue($event->can_view());
$this->assertEventContextNotUsed($event);
}
/**
@ -182,6 +183,7 @@ class mod_feedback_events_testcase extends advanced_testcase {
'objectid' => $this->eventfeedbackcompleted->id,
'other' => array('cmid' => $this->eventcm->id, 'anonymous' => 2)
));
$this->assertEventContextNotUsed($event);
$this->fail("Event validation should not allow \\mod_feedback\\event\\response_deleted to be triggered without
other['instanceid']");
} catch (coding_exception $e) {
@ -291,7 +293,7 @@ class mod_feedback_events_testcase extends advanced_testcase {
$this->assertTrue($event->can_view());
$this->setAdminUser();
$this->assertTrue($event->can_view());
$this->assertEventContextNotUsed($event);
}
/**

View File

@ -66,5 +66,6 @@ class mod_folder_events_testcase extends advanced_testcase {
$this->assertEquals($folder->id, $event->objectid);
$expected = array($course->id, 'folder', 'edit', 'edit.php?id=' . $folder->cmid, $folder->id, $folder->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -73,6 +73,7 @@ class mod_forum_lib_testcase extends advanced_testcase {
$expected->content = $fakepost->message;
$expected->pathnamehashes = array($fi->get_pathnamehash());
$this->assertEventLegacyData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_forum_get_courses_user_posted_in() {

View File

@ -76,6 +76,7 @@ class glossary_event_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/glossary/view.php', array('id' => $glossary->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
/**
@ -120,5 +121,6 @@ class glossary_event_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$url = new moodle_url('/mod/glossary/view.php', array('id' => $glossary->id));
$this->assertEquals($url, $event->get_url());
$this->assertEventContextNotUsed($event);
}
}

View File

@ -80,6 +80,7 @@ class mod_lesson_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'lesson', 'view grade', 'essay.php?id=' . $this->lesson->properties()->cmid .
'&mode=grade&attemptid=1', get_string('manualgrading', 'lesson'), $this->lesson->properties()->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -119,6 +120,7 @@ class mod_lesson_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'lesson', 'update highscores', 'highscores.php?id=' . $this->lesson->properties()->cmid,
'noob', $this->lesson->properties()->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -147,6 +149,7 @@ class mod_lesson_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'lesson', 'view highscores', 'highscores.php?id=' . $this->lesson->properties()->cmid,
$this->lesson->properties()->name, $this->lesson->properties()->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -165,6 +168,7 @@ class mod_lesson_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'lesson', 'start', 'view.php?id=' . $this->lesson->properties()->cmid,
$this->lesson->properties()->id, $this->lesson->properties()->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -193,6 +197,7 @@ class mod_lesson_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'lesson', 'end', 'view.php?id=' . $this->lesson->properties()->cmid,
$this->lesson->properties()->id, $this->lesson->properties()->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -228,5 +233,6 @@ class mod_lesson_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'lesson', 'update grade', 'essay.php?id=' . $this->lesson->properties()->cmid,
$this->lesson->name, $this->lesson->properties()->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -117,6 +117,7 @@ class mod_quiz_events_testcase extends advanced_testcase {
$legacydata->submitterid = null;
$legacydata->timefinish = $timefinish;
$this->assertEventLegacyData($legacydata, $event);
$this->assertEventContextNotUsed($event);
}
public function test_attempt_becameoverdue() {
@ -150,6 +151,7 @@ class mod_quiz_events_testcase extends advanced_testcase {
$legacydata->quizid = $quizobj->get_quizid();
$legacydata->submitterid = null; // Should be the user, but PHP Unit complains...
$this->assertEventLegacyData($legacydata, $event);
$this->assertEventContextNotUsed($event);
}
public function test_attempt_abandoned() {
@ -183,6 +185,7 @@ class mod_quiz_events_testcase extends advanced_testcase {
$legacydata->quizid = $quizobj->get_quizid();
$legacydata->submitterid = null; // Should be the user, but PHP Unit complains...
$this->assertEventLegacyData($legacydata, $event);
$this->assertEventContextNotUsed($event);
}
public function test_attempt_started() {
@ -218,5 +221,6 @@ class mod_quiz_events_testcase extends advanced_testcase {
$this->assertEquals($quizobj->get_context(), $event->get_context());
$this->assertEquals('quiz_attempt_started', $event->get_legacy_eventname());
$this->assertEventLegacyData($legacydata, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -68,6 +68,7 @@ class mod_resource_events_testcase extends advanced_testcase {
$this->assertEquals(context_course::instance($course->id), $event->get_context());
$expected = array($course->id, 'resource', 'view all', 'index.php?id='.$course->id, '');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -99,5 +100,6 @@ class mod_resource_events_testcase extends advanced_testcase {
$this->assertEquals($resource->id, $event->objectid);
$expected = array($course->id, 'resource', 'view', 'view.php?id=' . $resource->cmid, $resource->id, $resource->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -80,6 +80,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'delete attempts', 'report.php?id=' . $this->eventcm->id,
4, $this->eventscorm->id);
$this->assertEventLegacyLogData($expected, $events[0]);
$this->assertEventContextNotUsed($event);
// Test event validations.
$this->setExpectedException('coding_exception');
@ -113,6 +114,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'pre-view', 'view.php?id=' . $this->eventcm->id,
$this->eventscorm->id, $this->eventcm->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -136,6 +138,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
// Check that the legacy log data is valid.
$expected = array($this->eventcourse->id, 'scorm', 'view all', 'index.php?id=' . $this->eventcourse->id, '');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -162,6 +165,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'userreportinteractions', 'report/userreportinteractions.php?id=' .
$this->eventcm->id . '&user=5&attempt=' . 2, $this->eventscorm->id, $this->eventcm->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -216,6 +220,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'report', 'report.php?id=' . $this->eventcm->id . '&mode=basic',
$this->eventscorm->id, $this->eventcm->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
// Test validations.
$this->setExpectedException('coding_exception');
@ -250,6 +255,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'launch', 'view.php?id=' . $this->eventcm->id,
'url_to_content_that_was_laoded.php', $this->eventcm->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
// Test validations.
$this->setExpectedException('coding_exception');
@ -285,6 +291,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'userreporttracks', 'report/userreporttracks.php?id=' .
$this->eventcm->id . '&user=5&attempt=' . 2 . '&scoid=3', $this->eventscorm->id, $this->eventcm->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -352,6 +359,7 @@ class mod_scorm_event_testcase extends advanced_testcase {
$expected = array($this->eventcourse->id, 'scorm', 'userreport', 'report/userreport.php?id=' .
$this->eventcm->id . '&user=5&attempt=' . 2, $this->eventscorm->id, $this->eventcm->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**

View File

@ -83,6 +83,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertInstanceOf('\mod_wiki\event\comment_created', $event);
$this->assertEquals($context, $event->get_context());
$this->assertEquals($page->id, $event->other['itemid']);
$this->assertEventContextNotUsed($event);
}
/**
@ -111,6 +112,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertInstanceOf('\mod_wiki\event\comment_deleted', $event);
$this->assertEquals($context, $event->get_context());
$this->assertEquals($page->id, $event->other['itemid']);
$this->assertEventContextNotUsed($event);
}
/**
@ -142,6 +144,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$expected = array($this->course->id, 'wiki', 'comments', 'comments.php?pageid=' . $page->id, $page->id, $this->wiki->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -169,6 +172,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($context, $event->get_context());
$expected = array($this->course->id, 'wiki', 'view all', 'index.php?id=' . $this->course->id, '');
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -201,6 +205,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'wiki', 'view', 'view.php?id=' . $this->wiki->cmid,
$this->wiki->id, $this->wiki->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -234,6 +239,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($page->id, $event->objectid);
$expected = array($this->course->id, 'wiki', 'view', 'view.php?pageid=' . $page->id, $page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -268,6 +274,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($page->id, $event->objectid);
$expected = array($this->course->id, 'wiki', 'view', 'prettyview.php?pageid=' . $page->id, $page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -294,6 +301,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'wiki', 'add page',
'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -358,6 +366,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($page2->id, $event->objectid);
$expected = array($this->course->id, 'wiki', 'admin', 'admin.php?pageid=' . $page2->id, $page2->id, $this->wiki->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -385,6 +394,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'wiki', 'edit',
'view.php?pageid=' . $page->id, $page->id, $this->wiki->cmid);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -423,6 +433,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'wiki', 'diff', 'diff.php?pageid=' . $page->id . '&comparewith=' .
1 . '&compare=' . 2, $page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -456,6 +467,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($page->id, $event->objectid);
$expected = array($this->course->id, 'wiki', 'history', 'history.php?pageid=' . $page->id, $page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -493,6 +505,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals(0, $event->other['option']);
$expected = array($this->course->id, 'wiki', 'map', 'map.php?pageid=' . $page->id, $page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -531,6 +544,7 @@ class mod_wiki_events_testcase extends advanced_testcase {
$expected = array($this->course->id, 'wiki', 'history', 'viewversion.php?pageid=' . $page->id . '&versionid=1',
$page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -557,5 +571,6 @@ class mod_wiki_events_testcase extends advanced_testcase {
$this->assertEquals($page->id, $event->other['pageid']);
$expected = array($this->course->id, 'wiki', 'restore', 'view.php?pageid=' . $page->id, $page->id, $this->wiki->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -83,6 +83,7 @@ class core_notes_events_testcase extends advanced_testcase {
$logurl->set_anchor('note-' . $this->eventnote->id);
$arr = array($this->eventnote->courseid, 'notes', 'delete', $logurl, 'delete note');
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -113,7 +114,7 @@ class core_notes_events_testcase extends advanced_testcase {
$logurl->set_anchor('note-' . $note->id);
$arr = array($note->courseid, 'notes', 'add', $logurl, 'add note');
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
/**
@ -144,7 +145,7 @@ class core_notes_events_testcase extends advanced_testcase {
$logurl->set_anchor('note-' . $note->id);
$arr = array($note->courseid, 'notes', 'update', $logurl, 'update note');
$this->assertEventLegacyLogData($arr, $event);
$this->assertEventContextNotUsed($event);
}
}

View File

@ -63,6 +63,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$this->assertEquals(context_system::instance(), $event->get_context());
$this->assertEquals('A function', $event->other['function']);
$this->assertEventLegacyLogData($fakelogdata, $event);
$this->assertEventContextNotUsed($event);
}
public function test_login_failed() {
@ -101,6 +102,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$this->fail('The token cannot be allowed in \core\event\webservice_login_failed');
} catch (coding_exception $e) {
}
$this->assertEventContextNotUsed($event);
}
public function test_service_created() {
@ -145,6 +147,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices";
$expected = array(SITEID, 'webservice', 'add', $returnurl, get_string('addservice', 'webservice', $service));
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_service_updated() {
@ -189,6 +192,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices";
$expected = array(SITEID, 'webservice', 'edit', $returnurl, get_string('editservice', 'webservice', $service));
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_service_deleted() {
@ -233,6 +237,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$returnurl = $CFG->wwwroot . "/" . $CFG->admin . "/settings.php?section=externalservices";
$expected = array(SITEID, 'webservice', 'delete', $returnurl, get_string('deleteservice', 'webservice', $service));
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_service_user_added() {
@ -261,6 +266,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$expected = array(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id=' . $params['objectid'],
'add', '', $params['relateduserid']);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_service_user_removed() {
@ -289,6 +295,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$expected = array(SITEID, 'core', 'assign', $CFG->admin . '/webservice/service_users.php?id=' . $params['objectid'],
'remove', '', $params['relateduserid']);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_token_created() {
@ -317,6 +324,7 @@ class core_webservice_events_testcase extends advanced_testcase {
$this->assertEquals(2, $event->relateduserid);
$expected = array(SITEID, 'webservice', 'automatically create user token', '' , 'User ID: ' . 2);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
public function test_token_sent() {
@ -346,5 +354,6 @@ class core_webservice_events_testcase extends advanced_testcase {
$this->assertEquals(1, $event->objectid);
$expected = array(SITEID, 'webservice', 'sending requested user token', '' , 'User ID: ' . $user->id);
$this->assertEventLegacyLogData($expected, $event);
$this->assertEventContextNotUsed($event);
}
}