mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-83012 badges: avoid random timing failures in external test.

Browse Source 
This restores the original random failure fix from 9a5eb76a56, and
adds assertions appropriate to d9ea6bc804 without re-introducing the
same random test failures.

Also improve non-sensical conditional assertions.
This commit is contained in:
Paul Holden 2024-09-04 13:24:52 +01:00
parent 13c12756b4
commit 703b57db48
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
badges/tests/external/get_user_badge_by_hash_test.php vendored
View File

@ -53,6 +53,7 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
// Create users and enrolments.
$student1 = $this->getDataGenerator()->create_and_enrol($course);
$student2 = $this->getDataGenerator()->create_and_enrol($course);
$student3 = $this->getDataGenerator()->create_and_enrol($course);
$teacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
// Mock up a site badge.
@ -96,16 +97,11 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
$badge->dateissued = (int) $siteissuedbadge->dateissued;
$badge->dateexpire = $siteissuedbadge->dateexpire;
$badge->visible = (int) $siteissuedbadge->visible;
$badge->email = $student1->email;
$context = \context_system::instance();
$badge->badgeurl = \moodle_url::make_webservice_pluginfile_url($context->id, 'badges', 'badgeimage', $badge->id, '/',
'f3')->out(false);
$badge->status = BADGE_STATUS_ACTIVE_LOCKED;
// Add recipient.
$badge->recipientid = $student1->id;
$badge->recipientfullname = fullname($student1);
// Add an endorsement for the badge.
$endorsement = new \stdClass();
$endorsement->badgeid = $badgeid;
@ -138,7 +134,7 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
$badge->id = $DB->insert_record('badge', $badge, true);
$coursebadge = new \badge($badge->id );
$coursebadge->issue($student1->id, true);
$coursebadge->issue($student2->id, true);
$courseissuedbadge = $DB->get_record('badge_issued', [ 'badgeid' => $badge->id ]);
$badge->issuername = $coursebadge->issuername;
@ -150,7 +146,6 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
$badge->dateissued = (int) $courseissuedbadge->dateissued;
$badge->dateexpire = $courseissuedbadge->dateexpire;
$badge->visible = (int) $courseissuedbadge->visible;
$badge->email = $student1->email;
$context = \context_course::instance($badge->courseid);
$badge->badgeurl = \moodle_url::make_webservice_pluginfile_url($context->id, 'badges', 'badgeimage', $badge->id , '/',
'f3')->out(false);
@ -172,7 +167,8 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
'coursebadge' => $usercoursebadge,
'sitebadge' => $usersitebadge,
'student1' => $student1,
'student2' => $student2
'student2' => $student2,
'student3' => $student3,
];
}
@ -188,13 +184,17 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
// Site badge.
$result = get_user_badge_by_hash::execute($data['sitebadge'][0]['uniquehash']);
$result = \core_external\external_api::clean_returnvalue(get_user_badge_by_hash::execute_returns(), $result);
$this->assertEquals($data['sitebadge'][0], $result['badge'][0]);
$this->assertEquals($data['sitebadge'][0]['uniquehash'], $result['badge'][0]['uniquehash']);
$this->assertEquals($data['student1']->id, $result['badge'][0]['recipientid']);
$this->assertEquals(fullname($data['student1']), $result['badge'][0]['recipientfullname']);
$this->assertEmpty($result['warnings']);
// Course badge.
$result = get_user_badge_by_hash::execute($data['coursebadge'][0]['uniquehash']);
$result = \core_external\external_api::clean_returnvalue(get_user_badge_by_hash::execute_returns(), $result);
$this->assertEquals($data['coursebadge'][0], $result['badge'][0]);
$this->assertEquals($data['coursebadge'][0]['uniquehash'], $result['badge'][0]['uniquehash']);
$this->assertEquals($data['student2']->id, $result['badge'][0]['recipientid']);
$this->assertEquals(fullname($data['student2']), $result['badge'][0]['recipientfullname']);
$this->assertEmpty($result['warnings']);
// Wrong hash.
@ -211,7 +211,7 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
*/
public function test_get_user_badge_by_hash_with_restrictions(): void {
$data = $this->prepare_test_data();
$this->setUser($data['student2']);
$this->setUser($data['student3']);
// Site badge.
$result = get_user_badge_by_hash::execute($data['sitebadge'][0]['uniquehash']);
@ -220,20 +220,20 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
$this->assertEmpty($result['warnings']);
// Check that we don't have permissions for view the complete information for site badges.
if (isset($result['badge'][0]['type']) && $result['badge'][0]['type'] == BADGE_TYPE_SITE) {
$this->assertFalse(isset($result['badge'][0]['message']));
$this->assertArrayNotHasKey('message', $result['badge'][0]);
// Check that we have permissions to see all the data in alignments and related badges.
foreach ($result['badge'][0]['alignment'] as $alignment) {
$this->assertTrue(isset($alignment['id']));
}
// Check that we have permissions to see all the data in alignments and related badges.
$this->assertEquals([
$data['sitebadge'][0]['id'],
$data['sitebadge'][0]['id'],
], array_column($result['badge'][0]['alignment'], 'badgeid'));
foreach ($result['badge'][0]['relatedbadges'] as $relatedbadge) {
$this->assertTrue(isset($relatedbadge['id']));
}
} else {
$this->assertTrue(isset($result['badge'][0]['message']));
}
$this->assertEquals([
[
'id' => $data['coursebadge'][0]['id'],
'name' => $data['coursebadge'][0]['name'],
],
], $result['badge'][0]['relatedbadges']);
// Course badge.
$result = get_user_badge_by_hash::execute($data['coursebadge'][0]['uniquehash']);
@ -242,10 +242,6 @@ class get_user_badge_by_hash_test extends externallib_advanced_testcase {
$this->assertEmpty($result['warnings']);
// Check that we don't have permissions for view the complete information for course badges.
if (isset($result['badge'][0]['type']) && $result['badge'][0]['type'] == BADGE_TYPE_COURSE) {
$this->assertFalse(isset($result['badge'][0]['message']));
} else {
$this->assertTrue(isset($result['badge'][0]['message']));
}
$this->assertArrayNotHasKey('message', $result['badge'][0]);
}
}