From 320aee339cf1cbb590ad3532445c3fe821f2e3ab Mon Sep 17 00:00:00 2001
From: Ankit Agarwal <ankit@moodle.com>
Date: Tue, 6 Aug 2013 13:56:11 +0800
Subject: [PATCH] MDL-40935 phpunit: Remove assertLegacyEventName() since
 get_legacy_eventname() is public now

---
 lib/phpunit/classes/advanced_testcase.php | 15 ---------------
 lib/phpunit/classes/event_mock.php        |  8 --------
 lib/tests/accesslib_test.php              |  2 +-
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/lib/phpunit/classes/advanced_testcase.php b/lib/phpunit/classes/advanced_testcase.php
index 93296120aa2..0a4848d9141 100644
--- a/lib/phpunit/classes/advanced_testcase.php
+++ b/lib/phpunit/classes/advanced_testcase.php
@@ -338,21 +338,6 @@ abstract class advanced_testcase extends PHPUnit_Framework_TestCase {
         $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
index 82445ed86fb..26b99d1564d 100644
--- a/lib/phpunit/classes/event_mock.php
+++ b/lib/phpunit/classes/event_mock.php
@@ -35,14 +35,6 @@ require_once(__DIR__ . '/../../classes/event/base.php');
  */
 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
diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
index 406d2f5998b..6dee02ce1f3 100644
--- a/lib/tests/accesslib_test.php
+++ b/lib/tests/accesslib_test.php
@@ -486,7 +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);
+        $this->assertSame('role_assigned', $event::get_legacy_eventname());
     }
 
     /**