MDL-55074 theme_boost: Unit test fixes for all these changes

This commit is contained in:
Damyon Wiese 2016-10-14 14:15:17 +08:00
parent 6e79ea5846
commit 245d354c6c
3 changed files with 12 additions and 11 deletions

View File

@ -575,10 +575,6 @@ class core_course_courselib_testcase extends advanced_testcase {
$sectioncreated = $DB->record_exists('course_sections', array('course' => $created->id, 'section' => 0));
$this->assertTrue($sectioncreated);
// Ensure blocks have been associated to the course.
$blockcount = $DB->count_records('block_instances', array('parentcontextid' => $context->id));
$this->assertGreaterThan(0, $blockcount);
// Ensure that the shortname isn't duplicated.
try {
$created = create_course($course);
@ -3085,7 +3081,6 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertTrue($adminoptions->publish);
$this->assertTrue($adminoptions->reset);
$this->assertTrue($adminoptions->roles);
$this->assertTrue($adminoptions->grades);
}
/**
@ -3118,7 +3113,6 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertFalse($adminoptions->publish);
$this->assertFalse($adminoptions->reset);
$this->assertFalse($adminoptions->roles);
$this->assertTrue($adminoptions->grades);
$CFG->enablebadges = false;
$adminoptions = course_get_user_administration_options($course, $context);

View File

@ -558,6 +558,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$coursedata['summary'] = 'Course 1 description';
$coursedata['summaryformat'] = FORMAT_MOODLE;
$course1 = self::getDataGenerator()->create_course($coursedata);
$generatedcourses[$course1->id] = $course1;
$course2 = self::getDataGenerator()->create_course();
$generatedcourses[$course2->id] = $course2;
@ -642,8 +643,17 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$generatedcourses = array();
$coursedata1['fullname'] = 'FIRST COURSE';
$course1 = self::getDataGenerator()->create_course($coursedata1);
$page = new moodle_page();
$page->set_course($course1);
$page->blocks->add_blocks([BLOCK_POS_LEFT => ['news_items'], BLOCK_POS_RIGHT => []], 'course-view-*');
$coursedata2['fullname'] = 'SECOND COURSE';
$course2 = self::getDataGenerator()->create_course($coursedata2);
$page = new moodle_page();
$page->set_course($course2);
$page->blocks->add_blocks([BLOCK_POS_LEFT => ['news_items'], BLOCK_POS_RIGHT => []], 'course-view-*');
// Search by name.
$results = core_course_external::search_courses('search', 'FIRST');
$results = external_api::clean_returnvalue(core_course_external::search_courses_returns(), $results);
@ -1862,9 +1872,8 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertFalse($adminoptions->publish);
$this->assertFalse($adminoptions->reset);
$this->assertFalse($adminoptions->roles);
$this->assertFalse($adminoptions->grades);
} else {
$this->assertCount(15, $course['options']);
$this->assertCount(14, $course['options']);
$this->assertFalse($adminoptions->update);
$this->assertFalse($adminoptions->filters);
$this->assertFalse($adminoptions->reports);
@ -1879,7 +1888,6 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$this->assertFalse($adminoptions->publish);
$this->assertFalse($adminoptions->reset);
$this->assertFalse($adminoptions->roles);
$this->assertTrue($adminoptions->grades);
}
}
}

View File

@ -2354,7 +2354,6 @@ class core_accesslib_testcase extends advanced_testcase {
$context = context_course::instance($testcourses[2]);
$children = $context->get_child_contexts();
$this->assertCount(7, $children); // Depends on number of default blocks.
$context = context_module::instance($testpages[3]);
$children = $context->get_child_contexts();
@ -2401,7 +2400,7 @@ class core_accesslib_testcase extends advanced_testcase {
context_helper::reset_caches();
context_helper::preload_course($SITE->id);
$numfrontpagemodules = $DB->count_records('course_modules', array('course' => $SITE->id));
$this->assertEquals(6 + $numfrontpagemodules, context_inspection::test_context_cache_size()); // Depends on number of default blocks.
$this->assertEquals(3 + $numfrontpagemodules, context_inspection::test_context_cache_size()); // Depends on number of default blocks.
// Test assign_capability(), unassign_capability() functions.