mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
Merge branch 'MDL-76811-master' of https://github.com/andrewnicols/moodle
This commit is contained in:
commit
362818ff36
1 changed files with 52 additions and 45 deletions
|
@ -28,6 +28,9 @@ use stdClass;
|
||||||
* @coversDefaultClass \mod_data_generator
|
* @coversDefaultClass \mod_data_generator
|
||||||
*/
|
*/
|
||||||
class generator_test extends \advanced_testcase {
|
class generator_test extends \advanced_testcase {
|
||||||
|
/**
|
||||||
|
* @covers ::create_instance
|
||||||
|
*/
|
||||||
public function test_generator() {
|
public function test_generator() {
|
||||||
global $DB;
|
global $DB;
|
||||||
|
|
||||||
|
@ -42,9 +45,9 @@ class generator_test extends \advanced_testcase {
|
||||||
$this->assertInstanceOf('mod_data_generator', $generator);
|
$this->assertInstanceOf('mod_data_generator', $generator);
|
||||||
$this->assertEquals('data', $generator->get_modulename());
|
$this->assertEquals('data', $generator->get_modulename());
|
||||||
|
|
||||||
$generator->create_instance(array('course' => $course->id));
|
$generator->create_instance(['course' => $course->id]);
|
||||||
$generator->create_instance(array('course' => $course->id));
|
$generator->create_instance(['course' => $course->id]);
|
||||||
$data = $generator->create_instance(array('course' => $course->id));
|
$data = $generator->create_instance(['course' => $course->id]);
|
||||||
$this->assertEquals(3, $DB->count_records('data'));
|
$this->assertEquals(3, $DB->count_records('data'));
|
||||||
|
|
||||||
$cm = get_coursemodule_from_instance('data', $data->id);
|
$cm = get_coursemodule_from_instance('data', $data->id);
|
||||||
|
@ -55,16 +58,23 @@ class generator_test extends \advanced_testcase {
|
||||||
$context = \context_module::instance($cm->id);
|
$context = \context_module::instance($cm->id);
|
||||||
$this->assertEquals($data->cmid, $context->instanceid);
|
$this->assertEquals($data->cmid, $context->instanceid);
|
||||||
|
|
||||||
// test gradebook integration using low level DB access - DO NOT USE IN PLUGIN CODE!
|
// Test gradebook integration using low level DB access - DO NOT USE IN PLUGIN CODE!
|
||||||
$data = $generator->create_instance(array('course' => $course->id, 'assessed' => 1, 'scale' => 100));
|
$data = $generator->create_instance(['course' => $course->id, 'assessed' => 1, 'scale' => 100]);
|
||||||
$gitem = $DB->get_record('grade_items', array('courseid' => $course->id, 'itemtype' => 'mod',
|
$gitem = $DB->get_record('grade_items', [
|
||||||
'itemmodule' => 'data', 'iteminstance' => $data->id));
|
'courseid' => $course->id,
|
||||||
|
'itemtype' => 'mod',
|
||||||
|
'itemmodule' => 'data',
|
||||||
|
'iteminstance' => $data->id,
|
||||||
|
]);
|
||||||
$this->assertNotEmpty($gitem);
|
$this->assertNotEmpty($gitem);
|
||||||
$this->assertEquals(100, $gitem->grademax);
|
$this->assertEquals(100, $gitem->grademax);
|
||||||
$this->assertEquals(0, $gitem->grademin);
|
$this->assertEquals(0, $gitem->grademin);
|
||||||
$this->assertEquals(GRADE_TYPE_VALUE, $gitem->gradetype);
|
$this->assertEquals(GRADE_TYPE_VALUE, $gitem->gradetype);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers ::create_field
|
||||||
|
*/
|
||||||
public function test_create_field() {
|
public function test_create_field() {
|
||||||
global $DB;
|
global $DB;
|
||||||
|
|
||||||
|
@ -80,7 +90,7 @@ class generator_test extends \advanced_testcase {
|
||||||
$this->assertInstanceOf('mod_data_generator', $generator);
|
$this->assertInstanceOf('mod_data_generator', $generator);
|
||||||
$this->assertEquals('data', $generator->get_modulename());
|
$this->assertEquals('data', $generator->get_modulename());
|
||||||
|
|
||||||
$data = $generator->create_instance(array('course' => $course->id));
|
$data = $generator->create_instance(['course' => $course->id]);
|
||||||
$this->assertEquals(1, $DB->count_records('data'));
|
$this->assertEquals(1, $DB->count_records('data'));
|
||||||
|
|
||||||
$cm = get_coursemodule_from_instance('data', $data->id);
|
$cm = get_coursemodule_from_instance('data', $data->id);
|
||||||
|
@ -91,13 +101,12 @@ class generator_test extends \advanced_testcase {
|
||||||
$context = \context_module::instance($cm->id);
|
$context = \context_module::instance($cm->id);
|
||||||
$this->assertEquals($data->cmid, $context->instanceid);
|
$this->assertEquals($data->cmid, $context->instanceid);
|
||||||
|
|
||||||
$fieldtypes = array('checkbox', 'date', 'menu', 'multimenu', 'number', 'radiobutton', 'text', 'textarea', 'url');
|
$fieldtypes = ['checkbox', 'date', 'menu', 'multimenu', 'number', 'radiobutton', 'text', 'textarea', 'url'];
|
||||||
|
|
||||||
$count = 1;
|
$count = 1;
|
||||||
|
|
||||||
// Creating test Fields with default parameter values.
|
// Creating test Fields with default parameter values.
|
||||||
foreach ($fieldtypes as $fieldtype) {
|
foreach ($fieldtypes as $fieldtype) {
|
||||||
|
|
||||||
// Creating variables dynamically.
|
// Creating variables dynamically.
|
||||||
$fieldname = 'field-' . $count;
|
$fieldname = 'field-' . $count;
|
||||||
$record = new \stdClass();
|
$record = new \stdClass();
|
||||||
|
@ -110,17 +119,12 @@ class generator_test extends \advanced_testcase {
|
||||||
$count++;
|
$count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assertEquals(count($fieldtypes), $DB->count_records('data_fields', array('dataid' => $data->id)));
|
$this->assertEquals(count($fieldtypes), $DB->count_records('data_fields', ['dataid' => $data->id]));
|
||||||
|
|
||||||
$addtemplate = $DB->get_record('data', array('id' => $data->id), 'addtemplate');
|
|
||||||
$addtemplate = $addtemplate->addtemplate;
|
|
||||||
|
|
||||||
for ($i = 1; $i < $count; $i++) {
|
|
||||||
$fieldname = 'field-' . $i;
|
|
||||||
$this->assertTrue(strpos($addtemplate, '[[' . $fieldname . ']]') >= 0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers ::create_entry
|
||||||
|
*/
|
||||||
public function test_create_entry() {
|
public function test_create_entry() {
|
||||||
global $DB;
|
global $DB;
|
||||||
|
|
||||||
|
@ -133,15 +137,15 @@ class generator_test extends \advanced_testcase {
|
||||||
$course = $this->getDataGenerator()->create_course();
|
$course = $this->getDataGenerator()->create_course();
|
||||||
$this->getDataGenerator()->enrol_user($user1->id, $course->id, 'student');
|
$this->getDataGenerator()->enrol_user($user1->id, $course->id, 'student');
|
||||||
|
|
||||||
$groupa = $this->getDataGenerator()->create_group(array('courseid' => $course->id, 'name' => 'groupA'));
|
$groupa = $this->getDataGenerator()->create_group(['courseid' => $course->id, 'name' => 'groupA']);
|
||||||
$this->getDataGenerator()->create_group_member(array('userid' => $user1->id, 'groupid' => $groupa->id));
|
$this->getDataGenerator()->create_group_member(['userid' => $user1->id, 'groupid' => $groupa->id]);
|
||||||
|
|
||||||
/** @var mod_data_generator $generator */
|
/** @var mod_data_generator $generator */
|
||||||
$generator = $this->getDataGenerator()->get_plugin_generator('mod_data');
|
$generator = $this->getDataGenerator()->get_plugin_generator('mod_data');
|
||||||
$this->assertInstanceOf('mod_data_generator', $generator);
|
$this->assertInstanceOf('mod_data_generator', $generator);
|
||||||
$this->assertEquals('data', $generator->get_modulename());
|
$this->assertEquals('data', $generator->get_modulename());
|
||||||
|
|
||||||
$data = $generator->create_instance(array('course' => $course->id));
|
$data = $generator->create_instance(['course' => $course->id]);
|
||||||
$this->assertEquals(1, $DB->count_records('data'));
|
$this->assertEquals(1, $DB->count_records('data'));
|
||||||
|
|
||||||
$cm = get_coursemodule_from_instance('data', $data->id);
|
$cm = get_coursemodule_from_instance('data', $data->id);
|
||||||
|
@ -152,14 +156,14 @@ class generator_test extends \advanced_testcase {
|
||||||
$context = \context_module::instance($cm->id);
|
$context = \context_module::instance($cm->id);
|
||||||
$this->assertEquals($data->cmid, $context->instanceid);
|
$this->assertEquals($data->cmid, $context->instanceid);
|
||||||
|
|
||||||
$fieldtypes = array('checkbox', 'date', 'menu', 'multimenu', 'number', 'radiobutton', 'text', 'textarea', 'url',
|
$fieldtypes = ['checkbox', 'date', 'menu', 'multimenu', 'number', 'radiobutton', 'text', 'textarea', 'url',
|
||||||
'latlong', 'file', 'picture');
|
'latlong', 'file', 'picture',
|
||||||
|
];
|
||||||
|
|
||||||
$count = 1;
|
$count = 1;
|
||||||
|
|
||||||
// Creating test Fields with default parameter values.
|
// Creating test Fields with default parameter values.
|
||||||
foreach ($fieldtypes as $fieldtype) {
|
foreach ($fieldtypes as $fieldtype) {
|
||||||
|
|
||||||
// Creating variables dynamically.
|
// Creating variables dynamically.
|
||||||
$fieldname = 'field-' . $count;
|
$fieldname = 'field-' . $count;
|
||||||
$record = new \stdClass();
|
$record = new \stdClass();
|
||||||
|
@ -167,30 +171,27 @@ class generator_test extends \advanced_testcase {
|
||||||
$record->type = $fieldtype;
|
$record->type = $fieldtype;
|
||||||
$record->required = 1;
|
$record->required = 1;
|
||||||
|
|
||||||
${$fieldname} = $this->getDataGenerator()->get_plugin_generator('mod_data')->create_field($record, $data);
|
$this->getDataGenerator()->get_plugin_generator('mod_data')->create_field($record, $data);
|
||||||
$this->assertInstanceOf('data_field_' . $fieldtype, ${$fieldname});
|
|
||||||
$count++;
|
$count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assertEquals(count($fieldtypes), $DB->count_records('data_fields', array('dataid' => $data->id)));
|
$fields = $DB->get_records('data_fields', ['dataid' => $data->id], 'id');
|
||||||
|
|
||||||
$fields = $DB->get_records('data_fields', array('dataid' => $data->id), 'id');
|
$contents = [];
|
||||||
|
$contents[] = ['opt1', 'opt2', 'opt3', 'opt4'];
|
||||||
$contents = array();
|
|
||||||
$contents[] = array('opt1', 'opt2', 'opt3', 'opt4');
|
|
||||||
$contents[] = '01-01-2037'; // It should be lower than 2038, to avoid failing on 32-bit windows.
|
$contents[] = '01-01-2037'; // It should be lower than 2038, to avoid failing on 32-bit windows.
|
||||||
$contents[] = 'menu1';
|
$contents[] = 'menu1';
|
||||||
$contents[] = array('multimenu1', 'multimenu2', 'multimenu3', 'multimenu4');
|
$contents[] = ['multimenu1', 'multimenu2', 'multimenu3', 'multimenu4'];
|
||||||
$contents[] = '12345';
|
$contents[] = '12345';
|
||||||
$contents[] = 'radioopt1';
|
$contents[] = 'radioopt1';
|
||||||
$contents[] = 'text for testing';
|
$contents[] = 'text for testing';
|
||||||
$contents[] = '<p>text area testing<br /></p>';
|
$contents[] = '<p>text area testing<br /></p>';
|
||||||
$contents[] = array('example.url', 'sampleurl');
|
$contents[] = ['example.url', 'sampleurl'];
|
||||||
$contents[] = [-31.9489873, 115.8382036]; // Latlong.
|
$contents[] = [-31.9489873, 115.8382036]; // Latlong.
|
||||||
$contents[] = 'Filename.pdf'; // File - filename.
|
$contents[] = 'Filename.pdf'; // File - filename.
|
||||||
$contents[] = array('Cat1234.jpg', 'Cat'); // Picture - filename with alt text.
|
$contents[] = ['Cat1234.jpg', 'Cat']; // Picture - filename with alt text.
|
||||||
$count = 0;
|
$count = 0;
|
||||||
$fieldcontents = array();
|
$fieldcontents = [];
|
||||||
foreach ($fields as $fieldrecord) {
|
foreach ($fields as $fieldrecord) {
|
||||||
$fieldcontents[$fieldrecord->id] = $contents[$count++];
|
$fieldcontents[$fieldrecord->id] = $contents[$count++];
|
||||||
}
|
}
|
||||||
|
@ -198,16 +199,20 @@ class generator_test extends \advanced_testcase {
|
||||||
$tags = ['Cats', 'mice'];
|
$tags = ['Cats', 'mice'];
|
||||||
|
|
||||||
$this->setUser($user1);
|
$this->setUser($user1);
|
||||||
$datarecordid = $this->getDataGenerator()->get_plugin_generator('mod_data')->create_entry($data,
|
$datarecordid = $this->getDataGenerator()->get_plugin_generator('mod_data')->create_entry(
|
||||||
$fieldcontents, $groupa->id, $tags);
|
$data,
|
||||||
|
$fieldcontents,
|
||||||
|
$groupa->id,
|
||||||
|
$tags
|
||||||
|
);
|
||||||
|
|
||||||
$this->assertEquals(1, $DB->count_records('data_records', array('dataid' => $data->id)));
|
$this->assertEquals(1, $DB->count_records('data_records', ['dataid' => $data->id]));
|
||||||
$this->assertEquals(count($contents), $DB->count_records('data_content', array('recordid' => $datarecordid)));
|
$this->assertEquals(count($contents), $DB->count_records('data_content', ['recordid' => $datarecordid]));
|
||||||
|
|
||||||
$entry = $DB->get_record('data_records', array('id' => $datarecordid));
|
$entry = $DB->get_record('data_records', ['id' => $datarecordid]);
|
||||||
$this->assertEquals($entry->groupid, $groupa->id);
|
$this->assertEquals($entry->groupid, $groupa->id);
|
||||||
|
|
||||||
$contents = $DB->get_records('data_content', array('recordid' => $datarecordid), 'id');
|
$contents = $DB->get_records('data_content', ['recordid' => $datarecordid], 'id');
|
||||||
|
|
||||||
$contentstartid = 0;
|
$contentstartid = 0;
|
||||||
$flag = 0;
|
$flag = 0;
|
||||||
|
@ -229,8 +234,10 @@ class generator_test extends \advanced_testcase {
|
||||||
$this->assertEquals($contents[$contentstartid]->content1, '1');
|
$this->assertEquals($contents[$contentstartid]->content1, '1');
|
||||||
$this->assertEquals($contents[++$contentstartid]->content, 'http://example.url');
|
$this->assertEquals($contents[++$contentstartid]->content, 'http://example.url');
|
||||||
$this->assertEquals($contents[$contentstartid]->content1, 'sampleurl');
|
$this->assertEquals($contents[$contentstartid]->content1, 'sampleurl');
|
||||||
$this->assertEquals(array('Cats', 'mice'),
|
$this->assertEquals(
|
||||||
array_values(\core_tag_tag::get_item_tags_array('mod_data', 'data_records', $datarecordid)));
|
['Cats', 'mice'],
|
||||||
|
array_values(\core_tag_tag::get_item_tags_array('mod_data', 'data_records', $datarecordid))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue