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

Merge branch 'wip-MDL-51636-master' of https://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-10-05 14:59:16 +01:00
commit 7c88aa7bec
7 changed files with 70 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/testing/generator/data_generator.php
View file

@ -272,7 +272,17 @@ EOD;
context_user::instance($userid);
}
return $DB->get_record('user', array('id'=>$userid), '*', MUST_EXIST);
$user = $DB->get_record('user', array('id' => $userid), '*', MUST_EXIST);
if (!$record['deleted'] && isset($record['interests'])) {
require_once($CFG->dirroot . '/user/editlib.php');
if (!is_array($record['interests'])) {
$record['interests'] = preg_split('/\s*,\s*/', trim($record['interests']), -1, PREG_SPLIT_NO_EMPTY);
}
useredit_update_interests($user, $record['interests']);
}
return $user;
}
/**
@ -405,6 +415,10 @@ EOD;
$record['category'] = $DB->get_field_select('course_categories', "MIN(id)", "parent=0");
}
if (isset($record['tags']) && !is_array($record['tags'])) {
$record['tags'] = preg_split('/\s*,\s*/', trim($record['tags']), -1, PREG_SPLIT_NO_EMPTY);
}
$course = create_course((object)$record);
context_course::instance($course->id);
if (!empty($options['createsections'])) {

9
lib/testing/tests/generator_test.php
View file

@ -55,6 +55,7 @@ class core_test_generator_testcase extends advanced_testcase {
public function test_create_user() {
global $DB, $CFG;
require_once($CFG->dirroot.'/user/lib.php');
$this->resetAfterTest(true);
$generator = $this->getDataGenerator();
@ -124,6 +125,11 @@ class core_test_generator_testcase extends advanced_testcase {
$this->assertSame('', $user->idnumber);
$this->assertSame(md5($record['username']), $user->email);
$this->assertFalse(context_user::instance($user->id, IGNORE_MISSING));
// Test generating user with interests.
$user = $generator->create_user(array('interests' => 'Cats, Dogs'));
$userdetails = user_get_user_details($user);
$this->assertSame('Cats, Dogs', $userdetails['interests']);
}
public function test_create() {
@ -167,6 +173,9 @@ class core_test_generator_testcase extends advanced_testcase {
$section = $generator->create_course_section(array('course'=>$course->id, 'section'=>3));
$this->assertEquals($course->id, $section->course);
$course = $generator->create_course(array('tags' => 'Cat, Dog'));
$this->assertEquals('Cat, Dog', tag_get_tags_csv('course', $course->id, TAG_RETURN_TEXT));
$scale = $generator->create_scale();
$this->assertNotEmpty($scale);
}