L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w32_MDL-40901_m26_phpunitcleanup2' of https://github.com/skodak/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2013-08-06 08:53:24 +12:00
parent 1eebbc2854 aed2b9ba9c
commit b09abb05ab
51 changed files with 357 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tests/accesslib_test.php
+6 -6
View File
@@ -666,7 +666,7 @@ class core_accesslib_testcase extends advanced_testcase {
$this->resetAfterTest();
$allroles = get_all_roles();
$this->assertEquals('array', gettype($allroles));
$this->assertInternalType('array', $allroles);
$this->assertCount(8, $allroles); // There are 8 roles is standard install.
$role = reset($allroles);
@@ -689,7 +689,7 @@ class core_accesslib_testcase extends advanced_testcase {
$renames = $DB->get_records_menu('role_names', array('contextid'=>$coursecontext->id), '', 'roleid, name');
$allroles = get_all_roles($coursecontext);
$this->assertEquals('array', gettype($allroles));
$this->assertInternalType('array', $allroles);
$this->assertCount(9, $allroles);
$role = reset($allroles);
$role = (array)$role;
@@ -849,13 +849,13 @@ class core_accesslib_testcase extends advanced_testcase {
foreach ($archetypes as $archetype) {
$result = get_default_role_archetype_allows('assign', $archetype);
$this->assertEquals('array', gettype($result));
$this->assertInternalType('array', $result);
$result = get_default_role_archetype_allows('override', $archetype);
$this->assertEquals('array', gettype($result));
$this->assertInternalType('array', $result);
$result = get_default_role_archetype_allows('switch', $archetype);
$this->assertEquals('array', gettype($result));
$this->assertInternalType('array', $result);
}
$result = get_default_role_archetype_allows('assign', '');
@@ -1194,7 +1194,7 @@ class core_accesslib_testcase extends advanced_testcase {
$alllevels = context_helper::get_all_levels();
foreach ($archetypes as $archetype) {
$defaults = get_default_contextlevels($archetype);
$this->assertEquals('array', gettype($defaults));
$this->assertInternalType('array', $defaults);
foreach ($defaults as $level) {
$this->assertTrue(isset($alllevels[$level]));
}