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

Merge branch 'MDL-37835-master' of git://github.com/damyon/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-02-26 10:06:14 +01:00
commit 46e120c561
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mod/assign/tests/generator/lib.php
View file

@ -46,12 +46,6 @@ class mod_assign_generator extends testing_module_generator {
throw new coding_exception('module generator requires $record->course'); throw new coding_exception('module generator requires $record->course');
} }
if (isset($options['idnumber'])) {
$record->cmidnumber = $options['idnumber'];
} else {
$record->cmidnumber = '';
}
$defaultsettings = array( $defaultsettings = array(
'name' => get_string('pluginname', 'assign').' '.$i, 'name' => get_string('pluginname', 'assign').' '.$i,
'intro' => 'Test assign ' . $i, 'intro' => 'Test assign ' . $i,
@ -63,18 +57,13 @@ class mod_assign_generator extends testing_module_generator {
'sendlatenotifications' => 0, 'sendlatenotifications' => 0,
'duedate' => 0, 'duedate' => 0,
'allowsubmissionsfromdate' => 0, 'allowsubmissionsfromdate' => 0,
'assignsubmission_onlinetext_enabled' => 0,
'assignsubmission_file_enabled' => 0,
'assignsubmission_comments_enabled' => 0,
'assignfeedback_comments_enabled' => 0,
'assignfeedback_file_enabled' => 0,
'assignfeedback_offline_enabled' => 0,
'grade' => 100, 'grade' => 100,
'cutoffdate' => 0, 'cutoffdate' => 0,
'teamsubmission' => 0, 'teamsubmission' => 0,
'requireallteammemberssubmit' => 0, 'requireallteammemberssubmit' => 0,
'teamsubmissiongroupingid' => 0, 'teamsubmissiongroupingid' => 0,
'blindmarking' => 0, 'blindmarking' => 0,
'cmidnumber' => ''
); );
foreach ($defaultsettings as $name => $value) { foreach ($defaultsettings as $name => $value) {

12
mod/assign/tests/locallib_test.php
View file

@ -54,13 +54,21 @@ class mod_assign_locallib_testcase extends mod_assign_base_testcase {
public function test_get_feedback_plugins() { public function test_get_feedback_plugins() {
$this->setUser($this->editingteachers[0]); $this->setUser($this->editingteachers[0]);
$assign = $this->create_instance(); $assign = $this->create_instance();
$this->assertEquals(3, count($assign->get_feedback_plugins())); $installedplugins = array_keys(get_plugin_list('assignfeedback'));
foreach ($assign->get_feedback_plugins() as $plugin) {
$this->assertContains($plugin->get_type(), $installedplugins, 'Feedback plugin not in list of installed plugins');
}
} }
public function test_get_submission_plugins() { public function test_get_submission_plugins() {
$this->setUser($this->editingteachers[0]); $this->setUser($this->editingteachers[0]);
$assign = $this->create_instance(); $assign = $this->create_instance();
$this->assertEquals(3, count($assign->get_submission_plugins())); $installedplugins = array_keys(get_plugin_list('assignsubmission'));
foreach ($assign->get_submission_plugins() as $plugin) {
$this->assertContains($plugin->get_type(), $installedplugins, 'Submission plugin not in list of installed plugins');
}
} }
public function test_is_blind_marking() { public function test_is_blind_marking() {