From a41bf00517f0f0dcccf48b1eb77c380464e9015a Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Fri, 25 May 2018 11:44:02 +0800 Subject: [PATCH] MDL-55609 mod_assign: Move fixture to folder --- mod/assign/tests/base_test.php | 151 +---------------------------------------- 1 file changed, 2 insertions(+), 149 deletions(-) diff --git a/mod/assign/tests/base_test.php b/mod/assign/tests/base_test.php index ab2a0564d6a..bd1b313e0eb 100644 --- a/mod/assign/tests/base_test.php +++ b/mod/assign/tests/base_test.php @@ -29,6 +29,7 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/mod/assign/locallib.php'); require_once($CFG->dirroot . '/mod/assign/upgradelib.php'); +require_once(__DIR__ . '/fixtures/testable_assign.php'); /** * Unit tests for (some of) mod/assign/locallib.php. @@ -211,7 +212,7 @@ class mod_assign_base_testcase extends advanced_testcase { $instance = $generator->create_instance($params); $cm = get_coursemodule_from_instance('assign', $instance->id); $context = context_module::instance($cm->id); - return new testable_assign($context, $cm, $this->course); + return new mod_assign_testable_assign($context, $cm, $this->course); } public function test_create_instance() { @@ -219,151 +220,3 @@ class mod_assign_base_testcase extends advanced_testcase { } } - -/** - * Test subclass that makes all the protected methods we want to test public. - */ -class testable_assign extends assign { - - public function testable_show_intro() { - return parent::show_intro(); - } - - public function testable_delete_grades() { - return parent::delete_grades(); - } - - public function testable_apply_grade_to_user($formdata, $userid, $attemptnumber) { - return parent::apply_grade_to_user($formdata, $userid, $attemptnumber); - } - - public function testable_format_submission_for_log(stdClass $submission) { - return parent::format_submission_for_log($submission); - } - - public function testable_get_grading_userid_list() { - return parent::get_grading_userid_list(); - } - - public function testable_is_graded($userid) { - return parent::is_graded($userid); - } - - public function testable_update_submission(stdClass $submission, $userid, $updatetime, $teamsubmission) { - return parent::update_submission($submission, $userid, $updatetime, $teamsubmission); - } - - public function testable_process_add_attempt($userid = 0) { - return parent::process_add_attempt($userid); - } - - public function testable_process_save_quick_grades($postdata) { - // Ugly hack to get something into the method. - global $_POST; - $_POST = $postdata; - return parent::process_save_quick_grades(); - } - - public function testable_process_set_batch_marking_allocation($selectedusers, $markerid) { - global $CFG; - require_once($CFG->dirroot . '/mod/assign/batchsetallocatedmarkerform.php'); - - // Simulate the form submission. - $data = array(); - $data['id'] = $this->get_course_module()->id; - $data['selectedusers'] = $selectedusers; - $data['allocatedmarker'] = $markerid; - $data['action'] = 'setbatchmarkingallocation'; - mod_assign_batch_set_allocatedmarker_form::mock_submit($data); - - return parent::process_set_batch_marking_allocation(); - } - - public function testable_process_set_batch_marking_workflow_state($selectedusers, $state) { - global $CFG; - require_once($CFG->dirroot . '/mod/assign/batchsetmarkingworkflowstateform.php'); - - // Simulate the form submission. - $data = array(); - $data['id'] = $this->get_course_module()->id; - $data['selectedusers'] = $selectedusers; - $data['markingworkflowstate'] = $state; - $data['action'] = 'setbatchmarkingworkflowstate'; - mod_assign_batch_set_marking_workflow_state_form::mock_submit($data); - - return parent::process_set_batch_marking_workflow_state(); - } - - public function testable_submissions_open($userid = 0) { - return parent::submissions_open($userid); - } - - public function testable_save_user_extension($userid, $extensionduedate) { - return parent::save_user_extension($userid, $extensionduedate); - } - - public function testable_get_graders($userid) { - // Changed method from protected to public. - return parent::get_graders($userid); - } - - public function testable_get_notifiable_users($userid) { - return parent::get_notifiable_users($userid); - } - - public function testable_view_batch_set_workflow_state($selectedusers) { - global $PAGE; - $PAGE->set_url('/mod/assign/view.php'); - $mform = $this->testable_grading_batch_operations_form('setmarkingworkflowstate', $selectedusers); - return parent::view_batch_set_workflow_state($mform); - } - - public function testable_view_batch_markingallocation($selectedusers) { - global $PAGE; - $PAGE->set_url('/mod/assign/view.php'); - $mform = $this->testable_grading_batch_operations_form('setmarkingallocation', $selectedusers); - return parent::view_batch_markingallocation($mform); - } - - public function testable_grading_batch_operations_form($operation, $selectedusers) { - global $CFG; - - require_once($CFG->dirroot . '/mod/assign/gradingbatchoperationsform.php'); - - // Mock submit the grading operations form. - $data = array(); - $data['id'] = $this->get_course_module()->id; - $data['selectedusers'] = $selectedusers; - $data['returnaction'] = 'grading'; - $data['operation'] = $operation; - mod_assign_grading_batch_operations_form::mock_submit($data); - - // Set required variables in the form. - $formparams = array(); - $formparams['submissiondrafts'] = 1; - $formparams['duedate'] = 1; - $formparams['attemptreopenmethod'] = ASSIGN_ATTEMPT_REOPEN_METHOD_MANUAL; - $formparams['feedbackplugins'] = array(); - $formparams['markingworkflow'] = 1; - $formparams['markingallocation'] = 1; - $formparams['cm'] = $this->get_course_module()->id; - $formparams['context'] = $this->get_context(); - $mform = new mod_assign_grading_batch_operations_form(null, $formparams); - - return $mform; - } - - public function testable_update_activity_completion_records($teamsubmission, - $requireallteammemberssubmit, - $submission, - $userid, - $complete, - $completion) { - return parent::update_activity_completion_records($teamsubmission, - $requireallteammemberssubmit, - $submission, - $userid, - $complete, - $completion); - } -} -- 2.11.4.GIT