moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-69813 h5p: fix undefined addon ordering in framework test.

Browse source
This commit is contained in:
Paul Holden 2020-10-06 10:45:21 +01:00
parent c71355941b
commit 7e3f7e3d7c
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
h5p/tests/framework_test.php
View file

@ -25,7 +25,7 @@
namespace core_h5p; namespace core_h5p;
defined('MOODLE_INTERNAL') || die(); use core_collator;
/** /**
* *
@ -472,15 +472,19 @@ class framework_testcase extends \advanced_testcase {
// The addons array should return 2 results (Library and Library1 addon). // The addons array should return 2 results (Library and Library1 addon).
$this->assertCount(2, $addons); $this->assertCount(2, $addons);
// Ensure the addons array is consistently ordered before asserting their contents.
core_collator::asort_array_of_arrays_by_key($addons, 'machineName');
[$addonone, $addontwo] = array_values($addons);
// Make sure the version 1.3 is the latest 'Library' addon version. // Make sure the version 1.3 is the latest 'Library' addon version.
$this->assertEquals('Library', $addons[0]['machineName']); $this->assertEquals('Library', $addonone['machineName']);
$this->assertEquals(1, $addons[0]['majorVersion']); $this->assertEquals(1, $addonone['majorVersion']);
$this->assertEquals(3, $addons[0]['minorVersion']); $this->assertEquals(3, $addonone['minorVersion']);
// Make sure the version 1.2 is the latest 'Library1' addon version. // Make sure the version 1.2 is the latest 'Library1' addon version.
$this->assertEquals('Library1', $addons[1]['machineName']); $this->assertEquals('Library1', $addontwo['machineName']);
$this->assertEquals(1, $addons[1]['majorVersion']); $this->assertEquals(1, $addontwo['majorVersion']);
$this->assertEquals(2, $addons[1]['minorVersion']); $this->assertEquals(2, $addontwo['minorVersion']);
} }
/** /**
@ -504,7 +508,6 @@ class framework_testcase extends \advanced_testcase {
$this->assertEquals('1', $libraries['MainLibrary'][0]->major_version); $this->assertEquals('1', $libraries['MainLibrary'][0]->major_version);
$this->assertEquals('0', $libraries['MainLibrary'][0]->minor_version); $this->assertEquals('0', $libraries['MainLibrary'][0]->minor_version);
$this->assertEquals('1', $libraries['MainLibrary'][0]->patch_version); $this->assertEquals('1', $libraries['MainLibrary'][0]->patch_version);
$this->assertEquals('MainLibrary', $libraries['MainLibrary'][0]->machine_name);
} }
/** /**