Merge branch 'MDL-63864_master' of git://github.com/markn86/moodle

This commit is contained in:
Damyon Wiese
2018-11-12 10:02:25 +08:00
4 changed files with 107 additions and 50 deletions
+38 -8
View File
@@ -4062,14 +4062,44 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$request = reset($requests);
$this->assertEquals($user2->id, $request->id);
$this->assertEquals($user2->picture, $request->picture);
$this->assertEquals($user2->firstname, $request->firstname);
$this->assertEquals($user2->lastname, $request->lastname);
$this->assertEquals($user2->firstnamephonetic, $request->firstnamephonetic);
$this->assertEquals($user2->lastnamephonetic, $request->lastnamephonetic);
$this->assertEquals($user2->middlename, $request->middlename);
$this->assertEquals($user2->alternatename, $request->alternatename);
$this->assertEquals($user2->email, $request->email);
$this->assertEquals(fullname($user2), $request->fullname);
$this->assertObjectHasAttribute('profileimageurl', $request);
$this->assertObjectHasAttribute('profileimageurlsmall', $request);
$this->assertObjectHasAttribute('isonline', $request);
$this->assertObjectHasAttribute('showonlinestatus', $request);
$this->assertObjectHasAttribute('isblocked', $request);
$this->assertObjectHasAttribute('iscontact', $request);
}
/**
* Test getting contact requests when there are none.
*/
public function test_get_contact_requests_no_requests() {
$this->resetAfterTest();
$user1 = self::getDataGenerator()->create_user();
$requests = \core_message\api::get_contact_requests($user1->id);
$this->assertEmpty($requests);
}
/**
* Test getting contact requests with limits.
*/
public function test_get_contact_requests_with_limits() {
$this->resetAfterTest();
$user1 = self::getDataGenerator()->create_user();
$user2 = self::getDataGenerator()->create_user();
$user3 = self::getDataGenerator()->create_user();
\core_message\api::create_contact_request($user2->id, $user1->id);
\core_message\api::create_contact_request($user3->id, $user1->id);
$requests = \core_message\api::get_contact_requests($user1->id, 0, 1);
$this->assertCount(1, $requests);
}
/**