diff --git a/auth/tests/auth_test.php b/auth/tests/auth_test.php index 0b2b8ae00e8..c80ab385fb2 100644 --- a/auth/tests/auth_test.php +++ b/auth/tests/auth_test.php @@ -54,6 +54,10 @@ class auth_testcase extends advanced_testcase { $this->assertEquals('2', $event->objectid); $this->assertEquals(context_system::instance()->id, $event->contextid); $this->assertEquals($user, $event->get_record_snapshot('user', 2)); + + $this->assertEventLegacyData(null, $event); + $expectedlog = array(SITEID, 'user', 'login', "view.php?id=$USER->id&course=".SITEID, $user->id, 0, $user->id); + $this->assertEventLegacyLogData($expectedlog, $event); } public function test_user_loggedin_event_exceptions() { diff --git a/lib/phpunit/classes/advanced_testcase.php b/lib/phpunit/classes/advanced_testcase.php index 418a9a996c3..93296120aa2 100644 --- a/lib/phpunit/classes/advanced_testcase.php +++ b/lib/phpunit/classes/advanced_testcase.php @@ -306,6 +306,54 @@ abstract class advanced_testcase extends PHPUnit_Framework_TestCase { $this->assertEquals(0, $count, $message); } + /** + * Assert that an event legacy data is equal to the expected value. + * + * @param mixed $expected expected data. + * @param \core\event\base $event the event object. + * @param string $message + * @return void + */ + public function assertEventLegacyData($expected, \core\event\base $event, $message = '') { + $legacydata = phpunit_event_mock::testable_get_legacy_eventdata($event); + if ($message === '') { + $message = 'Event legacy data does not match expected value.'; + } + $this->assertEquals($expected, $legacydata, $message); + } + + /** + * Assert that an event legacy log data is equal to the expected value. + * + * @param mixed $expected expected data. + * @param \core\event\base $event the event object. + * @param string $message + * @return void + */ + public function assertEventLegacyLogData($expected, \core\event\base $event, $message = '') { + $legacydata = phpunit_event_mock::testable_get_legacy_logdata($event); + if ($message === '') { + $message = 'Event legacy log data does not match expected value.'; + } + $this->assertEquals($expected, $legacydata, $message); + } + + /** + * Assert that an event legacy name is equal to the expected value. + * + * @param mixed $expected expected name. + * @param \core\event\base $event the event object. + * @param string $message + * @return void + */ + public function assertEventLegacyName($expected, \core\event\base $event, $message = '') { + $legacydata = phpunit_event_mock::testable_get_legacy_eventname($event); + if ($message === '') { + $message = 'Event legacy name does not match expected value.'; + } + $this->assertEquals($expected, $legacydata, $message); + } + /** * Starts message redirection. * diff --git a/lib/phpunit/classes/event_mock.php b/lib/phpunit/classes/event_mock.php new file mode 100644 index 00000000000..82445ed86fb --- /dev/null +++ b/lib/phpunit/classes/event_mock.php @@ -0,0 +1,62 @@ +. + +/** + * Event mock. + * + * @package core + * @category phpunit + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +require_once(__DIR__ . '/../../classes/event/base.php'); + +/** + * Event mock class. + * + * @package core + * @category phpunit + * @copyright 2013 Frédéric Massart + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +abstract class phpunit_event_mock extends \core\event\base { + + /** + * Returns the log data of the event. + * @return array + */ + public static function testable_get_legacy_eventname($event) { + return $event->get_legacy_eventname(); + } + + /** + * Returns the log data of the event. + * @return array + */ + public static function testable_get_legacy_eventdata($event) { + return $event->get_legacy_eventdata(); + } + + /** + * Returns the log data of the event. + * @return array + */ + public static function testable_get_legacy_logdata($event) { + return $event->get_legacy_logdata(); + } + +} diff --git a/lib/phpunit/lib.php b/lib/phpunit/lib.php index 5dfdeab7c65..9f087609258 100644 --- a/lib/phpunit/lib.php +++ b/lib/phpunit/lib.php @@ -29,6 +29,7 @@ require_once('PHPUnit/Autoload.php'); require_once('PHPUnit/Extensions/Database/Autoload.php'); require_once(__DIR__.'/classes/util.php'); +require_once(__DIR__.'/classes/event_mock.php'); require_once(__DIR__.'/classes/event_sink.php'); require_once(__DIR__.'/classes/message_sink.php'); require_once(__DIR__.'/classes/basic_testcase.php'); diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php index 49966c7e0ce..6091362591a 100644 --- a/lib/tests/accesslib_test.php +++ b/lib/tests/accesslib_test.php @@ -486,6 +486,7 @@ class core_accesslib_testcase extends advanced_testcase { $this->assertEquals($raid, $event->other['id']); $this->assertSame('', $event->other['component']); $this->assertEquals(0, $event->other['itemid']); + $this->assertEventLegacyName('role_assigned', $event); } /**