mirror of
https://github.com/moodle/moodle.git
synced 2025-03-21 16:10:15 +01:00
Merge branch 'wip-mdl-57853' of https://github.com/rajeshtaneja/moodle
This commit is contained in:
commit
7c8ae843ed
@ -118,7 +118,7 @@ class tool_usertours_manager_testcase extends advanced_testcase {
|
||||
$rcm = $rc->getMethod($function);
|
||||
$rcm->setAccessible(true);
|
||||
|
||||
$this->setExpectedException('moodle_exception', 'A required parameter (sesskey) was missing');
|
||||
$this->expectException('moodle_exception');
|
||||
$rcm->invokeArgs($manager, $arguments);
|
||||
}
|
||||
|
||||
|
@ -516,7 +516,7 @@ class enrol_lti_helper_testcase extends advanced_testcase {
|
||||
$document->load(realpath(__DIR__ . '/fixtures/input.xml'));
|
||||
$xpath = new \DOMXpath($document);
|
||||
|
||||
$this->setExpectedException("coding_exception");
|
||||
$this->expectException('coding_exception');
|
||||
$function->invokeArgs(null, [$xpath, $parameters]);
|
||||
}
|
||||
|
||||
|
@ -57,7 +57,7 @@ class message_popup_externallib_testcase extends advanced_testcase {
|
||||
public function test_get_popup_notifications_no_user_exception() {
|
||||
$this->resetAfterTest(true);
|
||||
|
||||
$this->setExpectedException('moodle_exception');
|
||||
$this->expectException('moodle_exception');
|
||||
$result = message_popup_external::get_popup_notifications(-2132131, false, 0, 0);
|
||||
}
|
||||
|
||||
@ -72,7 +72,7 @@ class message_popup_externallib_testcase extends advanced_testcase {
|
||||
$user = $this->getDataGenerator()->create_user();
|
||||
|
||||
$this->setUser($user);
|
||||
$this->setExpectedException('moodle_exception');
|
||||
$this->expectException('moodle_exception');
|
||||
$result = message_popup_external::get_popup_notifications($sender->id, false, 0, 0);
|
||||
}
|
||||
|
||||
@ -141,7 +141,7 @@ class message_popup_externallib_testcase extends advanced_testcase {
|
||||
public function test_get_unread_popup_notification_count_invalid_user_exception() {
|
||||
$this->resetAfterTest(true);
|
||||
|
||||
$this->setExpectedException('moodle_exception');
|
||||
$this->expectException('moodle_exception');
|
||||
$result = message_popup_external::get_unread_popup_notification_count(-2132131, 0);
|
||||
}
|
||||
|
||||
@ -156,7 +156,7 @@ class message_popup_externallib_testcase extends advanced_testcase {
|
||||
$user = $this->getDataGenerator()->create_user();
|
||||
|
||||
$this->setUser($user);
|
||||
$this->setExpectedException('moodle_exception');
|
||||
$this->expectException('moodle_exception');
|
||||
$result = message_popup_external::get_unread_popup_notification_count($sender->id, 0);
|
||||
}
|
||||
|
||||
|
@ -868,7 +868,7 @@ class core_user_externallib_testcase extends externallib_advanced_testcase {
|
||||
$anotheruser = self::getDataGenerator()->create_user();
|
||||
$this->setUser($anotheruser);
|
||||
|
||||
$this->setExpectedException('required_capability_exception');
|
||||
$this->expectException('required_capability_exception');
|
||||
$result = core_user_external::get_user_preferences('', $user->id);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user