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

Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle

Browse source
This commit is contained in:
Damyon Wiese 2013-08-20 16:13:55 +08:00
commit e2f36a71a8
4 changed files with 112 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
enrol/tests/enrollib_test.php
View file

@ -250,4 +250,33 @@ class core_enrollib_testcase extends advanced_testcase {
$this->assertTrue(enrol_user_sees_own_courses());
$this->assertEquals($reads, $DB->perf_get_reads());
}
public function test_enrol_get_shared_courses() {
$this->resetAfterTest();
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user3 = $this->getDataGenerator()->create_user();
$course1 = $this->getDataGenerator()->create_course();
$this->getDataGenerator()->enrol_user($user1->id, $course1->id);
$this->getDataGenerator()->enrol_user($user2->id, $course1->id);
$course2 = $this->getDataGenerator()->create_course();
$this->getDataGenerator()->enrol_user($user1->id, $course2->id);
// Test that user1 and user2 have courses in common.
$this->assertTrue(enrol_get_shared_courses($user1, $user2, false, true));
// Test that user1 and user3 have no courses in common.
$this->assertFalse(enrol_get_shared_courses($user1, $user3, false, true));
// Test retrieving the courses in common.
$sharedcourses = enrol_get_shared_courses($user1, $user2, true);
// Only should be one shared course.
$this->assertCount(1, $sharedcourses);
$sharedcourse = array_shift($sharedcourses);
// It should be course 1.
$this->assertEquals($sharedcourse->id, $course1->id);
}
}

2
lib/enrollib.php
View file

@ -298,7 +298,7 @@ function enrol_get_shared_courses($user1, $user2, $preloadcontexts = false, $che
} else {
$courses = $DB->get_records_sql($sql, $params);
if ($preloadcontexts) {
array_map('context_instance_preload', $courses);
array_map('context_helper::preload_from_record', $courses);
}
return $courses;
}

2
mod/forum/lib.php
View file

@ -8134,7 +8134,7 @@ function forum_get_courses_user_posted_in($user, $discussionsonly = false, $incl
WHERE $wheresql";
$courses = $DB->get_records_sql($sql, $params, $limitfrom, $limitnum);
if ($includecontexts) {
array_map('context_instance_preload', $courses);
array_map('context_helper::preload_from_record', $courses);
}
return $courses;
}

81
mod/forum/tests/lib_test.php
View file

@ -75,4 +75,85 @@ class mod_forum_lib_testcase extends advanced_testcase {
$this->assertEventLegacyData($expected, $event);
}
public function test_forum_get_courses_user_posted_in() {
$this->resetAfterTest();
$user1 = $this->getDataGenerator()->create_user();
$user2 = $this->getDataGenerator()->create_user();
$user3 = $this->getDataGenerator()->create_user();
$course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course();
$course3 = $this->getDataGenerator()->create_course();
// Create 3 forums, one in each course.
$record = new stdClass();
$record->course = $course1->id;
$forum1 = $this->getDataGenerator()->create_module('forum', $record);
$record = new stdClass();
$record->course = $course2->id;
$forum2 = $this->getDataGenerator()->create_module('forum', $record);
$record = new stdClass();
$record->course = $course3->id;
$forum3 = $this->getDataGenerator()->create_module('forum', $record);
// Add discussions to course 1 and 2 started by user1.
$record = new stdClass();
$record->course = $course1->id;
$record->userid = $user1->id;
$record->forum = $forum1->id;
$this->getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
$record = new stdClass();
$record->course = $course2->id;
$record->userid = $user1->id;
$record->forum = $forum2->id;
$this->getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
// Add discussions to course 3 started by user2.
$record = new stdClass();
$record->course = $course3->id;
$record->userid = $user2->id;
$record->forum = $forum3->id;
$discussion3 = $this->getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
// Add post to course 3 by user1.
$record = new stdClass();
$record->course = $course3->id;
$record->userid = $user1->id;
$record->forum = $forum3->id;
$record->discussion = $discussion3->id;
$this->getDataGenerator()->get_plugin_generator('mod_forum')->create_post($record);
// User 3 hasn't posted anything, so shouldn't get any results.
$user3courses = forum_get_courses_user_posted_in($user3);
$this->assertEmpty($user3courses);
// User 2 has only posted in course3.
$user2courses = forum_get_courses_user_posted_in($user2);
$this->assertCount(1, $user2courses);
$user2course = array_shift($user2courses);
$this->assertEquals($course3->id, $user2course->id);
$this->assertEquals($course3->shortname, $user2course->shortname);
// User 1 has posted in all 3 courses.
$user1courses = forum_get_courses_user_posted_in($user1);
$this->assertCount(3, $user1courses);
foreach ($user1courses as $course) {
$this->assertContains($course->id, array($course1->id, $course2->id, $course3->id));
$this->assertContains($course->shortname, array($course1->shortname, $course2->shortname,
$course3->shortname));
}
// User 1 has only started a discussion in course 1 and 2 though.
$user1courses = forum_get_courses_user_posted_in($user1, true);
$this->assertCount(2, $user1courses);
foreach ($user1courses as $course) {
$this->assertContains($course->id, array($course1->id, $course2->id));
$this->assertContains($course->shortname, array($course1->shortname, $course2->shortname));
}
}
}