WebSVN – Moodle – Diff – /mod/assign/tests/locallib_test.php

 /**
  * Unit tests for (some of) mod/assign/locallib.php.
+ *
  * @package    mod_assign
- * @category   phpunit
+ * @category   test
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
  * Unit tests for (some of) mod/assign/locallib.php.
+ *
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class locallib_test extends \advanced_testcase {
+final class locallib_test extends \advanced_testcase {
     // Use the generator helper.
     use mod_assign_test_generator;
     /** @var array */
+    }
     /**
      * Data provider for test_get_assign_perpage
      *
-     * @return array Provider data
+     * @return array[] Provider data
      */
-    public function get_assign_perpage_provider() {
+    public static function get_assign_perpage_provider(): array {
-        return array(
+        return [
             array(
                 'maxperpage' => -1,
-                'userprefs' => array(
+                'userprefs' => [
                     -1 => -1,
 => 10,
 => 20,
 => 50,
-                ),
+                ],
-            ),
+            ],
             array(
                 'maxperpage' => 15,
-                'userprefs' => array(
+                'userprefs' => [
                     -1 => 15,
 => 10,
 => 15,
 => 15,
-                ),
+                ],
-            ),
+            ],
-        );
+        ];
+    }
     /**
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $this->setUser($teacher);
         $assign = $this->create_instance($course, [
                 'assignsubmission_onlinetext_enabled' => 1,
                 'assignfeedback_comments_enabled' => 0,
-                'grade' => GRADE_TYPE_NONE
+                'grade' => GRADE_TYPE_NONE,
             ]);
-        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', array(
+        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', [
             'id' => $assign->get_course_module()->id,
             'action' => 'grading',
-        )));
+        ]));
         // Render the table with the requires grading filter.
         $time = time();
         $assign = $this->create_instance($course, [
                 'assignsubmission_onlinetext_enabled' => 1,
                 'duedate' => time() - (4 * DAYSECS),
             ]);
-        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', array(
+        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', [
             'id' => $assign->get_course_module()->id,
             'action' => 'grading',
-        )));
+        ]));
         // Check that the assignment is late.
         $gradingtable = new \assign_grading_table($assign, 1, '', 0, true);
         $output = $assign->get_renderer()->render($gradingtable);
         $time = time();
         $assign = $this->create_instance($course, [
                 'assignsubmission_onlinetext_enabled' => 1,
                 'duedate' => time() - (4 * DAYSECS),
             ]);
-        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', array(
+        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', [
             'id' => $assign->get_course_module()->id,
             'action' => 'grading',
-        )));
+        ]));
         // Check that the assignment is late.
         $gradingtable = new \assign_grading_table($assign, 1, '', 0, true);
         $output = $assign->get_renderer()->render($gradingtable);
         $output = $assign->get_renderer()->render($gradingtable);
         $this->assertStringContainsString(get_string('submissionstatus_submitted', 'assign'), $output);
         $this->assertStringContainsString(get_string('userextensiondate', 'assign', userdate($time - (2 * DAYSECS))), $output);
+        $difftime = $submittedtime - $time;
-        $difftime = $submittedtime - $time;
+        $this->assertStringContainsString(
-        $this->assertStringContainsString(get_string('submittedlateshort', 'assign', format_time((2 * DAYSECS) + $difftime)),
+            get_string('submittedlateshort', 'assign', format_time((2 * DAYSECS) + $difftime)),
+            $output
-            $output);
+        );
+    }
         $time = time();
         $assign = $this->create_instance($course, [
             'assignsubmission_onlinetext_enabled' => 1,
             'duedate' => $time - (4 * DAYSECS),
          ]);
-        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', array(
+        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', [
             'id' => $assign->get_course_module()->id,
             'action' => 'grading',
-        )));
+        ]));
         // Check that the assignment is late.
         $gradingtable = new \assign_grading_table($assign, 1, '', 0, true);
         $output = $assign->get_renderer()->render($gradingtable);
         $this->assertStringContainsString(get_string('overdue', 'assign', format_time((4 * DAYSECS) + $difftime)), $output);
         $document = new \DOMDocument();
         @$document->loadHTML($output);
         $xpath = new \DOMXPath($document);
-        $this->assertEmpty($xpath->evaluate('string(//td[@id="mod_assign_grading-' . $assign->get_context()->id. '_r0_c8"])'));
+        $this->assertEmpty($xpath->evaluate('string(//td[@id="mod_assign_grading-' . $assign->get_context()->id . '_r0_c6"])'));
+    }
     /**
             'teamsubmission' => 1,
             'assignsubmission_onlinetext_enabled' => 1,
             'submissiondrafts' => 1,
             'requireallteammemberssubmit' => 0,
         ]);
-        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', array(
+        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', [
             'id' => $assign->get_course_module()->id,
             'action' => 'grading',
-        )));
+        ]));
         // Add a submission.
         $this->setUser($student);
         $data = new \stdClass();
         $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text',
             'format' => FORMAT_MOODLE,
         ];
-        $notices = array();
+        $notices = [];
         $assign->save_submission($data, $notices);
         $submission = $assign->get_group_submission($student->id, 0, true);
         // The XPath expression is based on the unique ID of the table.
         $xpathuniqueidroot = 'mod_assign_grading-' . $assign->get_context()->id;
+        // Check status.
-        // Check status.
+        $this->assertSame(
+            get_string('submissionstatus_submitted', 'assign'),
+            $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c3"]//div[@class="submissionstatussubmitted"])')
-        $this->assertSame(get_string('submissionstatus_submitted', 'assign'),
+        );
-            $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c4"]/div[@class="submissionstatussubmitted"])'));
+        $this->assertSame(
+            get_string('submissionstatus_submitted', 'assign'),
-        $this->assertSame(get_string('submissionstatus_submitted', 'assign'),
+            $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c3"]//div[@class="submissionstatussubmitted"])')
-            $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c4"]/div[@class="submissionstatussubmitted"])'));
+        );
         // Check submission last modified date.
-        $this->assertGreaterThan(0, strtotime($xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c8"])')));
+        $this->assertGreaterThan(0, strtotime($xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c6"])')));
-        $this->assertGreaterThan(0, strtotime($xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c8"])')));
+        $this->assertGreaterThan(0, strtotime($xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c6"])')));
         // Check group.
-        $this->assertSame($group->name, $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c5"])'));
+        $this->assertSame($group->name, $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c4"])'));
-        $this->assertSame($group->name, $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c5"])'));
+        $this->assertSame($group->name, $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c4"])'));
         // Check submission text.
-        $this->assertSame('Submission text', $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c9"]/div/div)'));
+        $this->assertSame('Submission text', $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r0_c7"]/div/div)'));
-        $this->assertSame('Submission text', $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c9"]/div/div)'));
+        $this->assertSame('Submission text', $xpath->evaluate('string(//td[@id="' . $xpathuniqueidroot . '_r3_c7"]/div/div)'));
         // Check comments can be made.
         // Submit the submission.
         $submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
         $assign->testable_update_submission($submission, $student->id, true, false);
         $data = new \stdClass();
-        $data->onlinetext_editor = array(
+        $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text',
-            'format' => FORMAT_MOODLE);
+            'format' => FORMAT_MOODLE];
         $plugin = $assign->get_submission_plugin_by_type('onlinetext');
         $plugin->save($submission, $data);
         // Now try and delete.
         $this->setUser($teacher);
         $this->assertEquals(true, $assign->delete_instance());
+    }
+    /**
+     * @covers ::assign_reset_userdata
      */
     public function test_reset_userdata(): void {
         global $DB;
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $now = time();
         $this->setUser($teacher);
         $assign = $this->create_instance($course, [
+            'assignsubmission_onlinetext_enabled' => 1,
-                'assignsubmission_onlinetext_enabled' => 1,
+            'allowsubmissionsfromdate' => $now - HOURSECS,
+            'duedate' => $now,
+            'cutoffdate' => $now + HOURSECS,
-                'duedate' => $now,
+            'gradingduedate' => $now + DAYSECS,
-            ]);
+        ]);
         // Simulate adding a grade.
         $this->add_submission($student, $assign);
         $this->submit_for_grading($student, $assign);
         $this->mark_submission($teacher, $assign, $student, 50.0);
         // Simulate a submission.
         $this->setUser($student);
         $submission = $assign->get_user_submission($student->id, true);
         $data = new \stdClass();
-        $data->onlinetext_editor = array(
+        $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text',
-            'format' => FORMAT_MOODLE);
+            'format' => FORMAT_MOODLE];
         $plugin = $assign->get_submission_plugin_by_type('onlinetext');
         $this->setUser($teacher);
         $assign->reset_userdata($data);
         $this->assertEquals(false, $assign->has_submissions_or_grades());
         // Reload the instance data.
+        $instance = $DB->get_record('assign', ['id' => $assign->get_instance()->id]);
-        $instance = $DB->get_record('assign', array('id' => $assign->get_instance()->id));
+        $this->assertEquals($now - HOURSECS + DAYSECS, $instance->allowsubmissionsfromdate);
+        $this->assertEquals($now + DAYSECS, $instance->duedate);
+        $this->assertEquals($now + HOURSECS + DAYSECS, $instance->cutoffdate);
-        $this->assertEquals($now + DAYSECS, $instance->duedate);
+        $this->assertEquals($now + DAYSECS + DAYSECS, $instance->gradingduedate);
         // Test reset using assign_reset_userdata().
         $assignduedate = $instance->duedate; // Keep old updated value for comparison.
         $data->timeshift = (2 * DAYSECS);
         assign_reset_userdata($data);
-        $instance = $DB->get_record('assign', array('id' => $assign->get_instance()->id));
+        $instance = $DB->get_record('assign', ['id' => $assign->get_instance()->id]);
         $this->assertEquals($assignduedate + (2 * DAYSECS), $instance->duedate);
         // Create one more assignment and reset, make sure time shifted for previous assignment is not changed.
         $assign2 = $this->create_instance($course, [
                 'assignsubmission_onlinetext_enabled' => 1,
                 'duedate' => $now,
             ]);
         $assignduedate = $instance->duedate;
         $data->timeshift = 3 * DAYSECS;
         $assign2->reset_userdata($data);
-        $instance = $DB->get_record('assign', array('id' => $assign->get_instance()->id));
+        $instance = $DB->get_record('assign', ['id' => $assign->get_instance()->id]);
         $this->assertEquals($assignduedate, $instance->duedate);
-        $instance2 = $DB->get_record('assign', array('id' => $assign2->get_instance()->id));
+        $instance2 = $DB->get_record('assign', ['id' => $assign2->get_instance()->id]);
         $this->assertEquals($now + 3 * DAYSECS, $instance2->duedate);
         // Reset both assignments using assign_reset_userdata() and make sure both assignments have same date.
         $assignduedate = $instance->duedate;
         $assign2duedate = $instance2->duedate;
         $data->timeshift = (4 * DAYSECS);
         assign_reset_userdata($data);
-        $instance = $DB->get_record('assign', array('id' => $assign->get_instance()->id));
+        $instance = $DB->get_record('assign', ['id' => $assign->get_instance()->id]);
         $this->assertEquals($assignduedate + (4 * DAYSECS), $instance->duedate);
-        $instance2 = $DB->get_record('assign', array('id' => $assign2->get_instance()->id));
+        $instance2 = $DB->get_record('assign', ['id' => $assign2->get_instance()->id]);
         $_REQUEST['introeditor'] = $draftid;
         $_POST['introeditor'] = $draftid;
         $_POST['sesskey'] = sesskey();
+        // Write links to a draft area.
-        // Write links to a draft area.
+        $fakearealink1 = file_rewrite_pluginfile_urls(
-        $fakearealink1 = file_rewrite_pluginfile_urls('<a href="@@PLUGINFILE@@/pic.gif">link</a>', 'draftfile.php', $userctx,
+            '<a href="@@PLUGINFILE@@/pic.gif">link</a>',
+            'draftfile.php',
+            $userctx,
+            'user',
+            'draft',
+            $draftid
-            'user', 'draft', $draftid);
+        );
+        $fakearealink2 = file_rewrite_pluginfile_urls(
-        $fakearealink2 = file_rewrite_pluginfile_urls('<a href="@@PLUGINFILE@@/pic.gif">new</a>', 'draftfile.php', $userctx,
+            '<a href="@@PLUGINFILE@@/pic.gif">new</a>',
+            'draftfile.php',
+            $userctx,
+            'user',
+            'draft',
+            $draftid
-            'user', 'draft', $draftid);
+        );
         // Create a new \assignment with links to a draft area.
         $now = time();
         $assign = $this->create_instance($course, [
                 'duedate' => $now,
                 'intro' => $fakearealink1,
-                'introformat' => FORMAT_HTML
+                'introformat' => FORMAT_HTML,
             ]);
         // See if there is an event in the calendar.
-        $params = array('modulename' => 'assign', 'instance' => $assign->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign->get_instance()->id];
         $event = $DB->get_record('event', $params);
         $this->assertNotEmpty($event);
         $this->assertSame('link', $event->description);     // The pluginfile links are removed.
         // Make sure the same works when updating the assignment.
         $instance = $assign->get_instance();
         $instance->instance = $instance->id;
         $instance->intro = $fakearealink2;
         $instance->introformat = FORMAT_HTML;
         $assign->update_instance($instance);
-        $params = array('modulename' => 'assign', 'instance' => $assign->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign->get_instance()->id];
                 'allowsubmissionsfromdate' => $now + 60,
                 'intro' => 'Some text',
             ]);
         // Get the event from the calendar.
-        $params = array('modulename' => 'assign', 'instance' => $assign->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign->get_instance()->id];
         $event = $DB->get_record('event', [
             'modulename' => 'assign',
             'instance' => $assign->get_instance()->id,
         ]);
         $this->assertEmpty($event->description);
         // Change the allowsubmissionfromdate to the past - do this directly in the DB
         // because if we call the assignment update method - it will update the calendar
         // and we want to test that this works from cron.
-        $DB->set_field('assign', 'allowsubmissionsfromdate', $now - 60, array('id' => $assign->get_instance()->id));
+        $DB->set_field('assign', 'allowsubmissionsfromdate', $now - 60, ['id' => $assign->get_instance()->id]);
         // Run cron to update the event in the calendar.
-        \assign::cron();
-        $event = $DB->get_record('event', $params);
+        \assign::cron();
         $event = $DB->get_record('event', $params);
         $this->assertStringContainsString('Some text', $event->description);
         $PAGE->set_url(new \moodle_url('/mod/assign/view.php', ['id' => $assign->get_course_module()->id]));
         // Test you cannot see the submit button for an offline assignment regardless.
         $this->setUser($student);
+        $output = $assign->view_student_summary($student, true);
-        $output = $assign->view_student_summary($student, true);
+        $this->assertStringNotContainsString(
+            get_string('submitassignment', 'assign'),
-        $this->assertStringNotContainsString(get_string('submitassignment', 'assign'),
+            $output,
+            'Can submit empty offline assignment'
-            $output, 'Can submit empty offline assignment');
+        );
+    }
         $PAGE->set_url(new \moodle_url('/mod/assign/view.php', ['id' => $assign->get_course_module()->id]));
         // Test you cannot see the submit button for an online text assignment with no submission.
         $this->setUser($student);
+        $output = $assign->view_student_summary($student, true);
-        $output = $assign->view_student_summary($student, true);
+        $this->assertStringNotContainsString(
+            get_string('submitassignment', 'assign'),
-        $this->assertStringNotContainsString(get_string('submitassignment', 'assign'),
+            $output,
+            'Cannot submit empty onlinetext assignment'
-            $output, 'Cannot submit empty onlinetext assignment');
+        );
+    }
         $this->add_submission($student, $assign);
         // Test you can see the submit button for an online text assignment with a submission.
         $this->setUser($student);
+        $output = $assign->view_submission_action_bar($assign->get_instance(), $student);
-        $output = $assign->view_submission_action_bar($assign->get_instance(), $student);
+        $this->assertStringContainsString(
+            get_string('submitassignment', 'assign'),
-        $this->assertStringContainsString(get_string('submitassignment', 'assign'),
+            $output,
+            'Can submit non empty onlinetext assignment'
-            $output, 'Can submit non empty onlinetext assignment');
+        );
+    }
     /**
+    }
     /**
      * Dataprovider for the test_new_submission_empty testcase
      *
-     * @return array of testcases
+     * @return array[] An array of testcases
      */
-    public function new_submission_empty_testcases() {
+    public static function new_submission_empty_testcases(): array {
         return [
             'With file and onlinetext' => [
+                [
                     'file' => [
                         'component' => 'user',
                         'filearea' => 'draft',
                         'filepath' => '/',
-                        'filename' => 'not_a_virus.exe'
+                        'filename' => 'not_a_virus.exe',
                     ],
-                    'onlinetext' => 'Balin Fundinul Uzbadkhazaddumu'
+                    'onlinetext' => 'Balin Fundinul Uzbadkhazaddumu',
                 ],
-                false
+                false,
             ],
         ];
+    }
         $course = $this->getDataGenerator()->create_course();
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         $group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_add_member($group1, $student1);
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student3 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group1->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group1->id, 'groupingid' => $grouping->id]);
         $group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group2->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group2->id, 'groupingid' => $grouping->id]);
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student3 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group1->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group1->id, 'groupingid' => $grouping->id]);
         $group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group2->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group2->id, 'groupingid' => $grouping->id]);
      */
     public function test_count_teams_groups_only(): void {
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $assign = $this->create_instance($course, [
             'teamsubmission' => 1,
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_add_member($group2, $student2);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group1->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group1->id, 'groupingid' => $grouping->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group2->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group2->id, 'groupingid' => $grouping->id]);
         $this->setUser($this->extrastudents[1]);
         $submission = $assign->get_group_submission($this->extrastudents[1]->id, $groupid, true);
         $submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
         $assign->testable_update_submission($submission, $this->extrastudents[1]->id, true, false);
         $data = new \stdClass();
-        $data->onlinetext_editor = array(
+        $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text',
-            'format' => FORMAT_MOODLE);
+            'format' => FORMAT_MOODLE];
         $plugin = $assign->get_submission_plugin_by_type('onlinetext');
         $plugin->save($submission, $data);
         // Simulate a submission.
         $this->setUser($this->extrastudents[2]);
         $submission = $assign->get_group_submission($this->extrastudents[2]->id, $groupid, true);
         $submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
         $assign->testable_update_submission($submission, $this->extrastudents[2]->id, true, false);
         $data = new \stdClass();
-        $data->onlinetext_editor = array(
+        $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text',
-            'format' => FORMAT_MOODLE);
+            'format' => FORMAT_MOODLE];
         $plugin = $assign->get_submission_plugin_by_type('onlinetext');
         $plugin->save($submission, $data);
         // Simulate a submission.
         $this->setUser($this->extrastudents[3]);
         $submission = $assign->get_group_submission($this->extrastudents[3]->id, $groupid, true);
         $submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
         $assign->testable_update_submission($submission, $this->extrastudents[3]->id, true, false);
         $data = new \stdClass();
-        $data->onlinetext_editor = array(
+        $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text',
-            'format' => FORMAT_MOODLE);
+            'format' => FORMAT_MOODLE];
         $plugin = $assign->get_submission_plugin_by_type('onlinetext');
         $plugin->save($submission, $data);
         $course = $this->getDataGenerator()->create_course();
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $suspendedstudent = $this->getDataGenerator()->create_and_enrol(
+            $course,
+            'student',
+            null,
+            'manual',
+,
-        $suspendedstudent = $this->getDataGenerator()->create_and_enrol(
+,
+            ENROL_USER_SUSPENDED
-            $course, 'student', null, 'manual', 0, 0, ENROL_USER_SUSPENDED);
+        );
         $this->setUser($teacher);
         $course = $this->getDataGenerator()->create_course();
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $suspendedstudent = $this->getDataGenerator()->create_and_enrol(
+            $course,
+            'student',
+            null,
+            'manual',
+,
-        $suspendedstudent = $this->getDataGenerator()->create_and_enrol(
+,
+            ENROL_USER_SUSPENDED
-            $course, 'student', null, 'manual', 0, 0, ENROL_USER_SUSPENDED);
+        );
         $this->setUser($teacher);
         // First run cron so there are no messages waiting to be sent (from other tests).
         \core\cron::setup_user();
         \assign::cron();
-        $course = $this->getDataGenerator()->create_course();
+        $course = $this->getDataGenerator()->create_course(['shortname' => 'E&U']);
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        // Now create an assignment and add some feedback.
-        // Now create an assignment and add some feedback.
+        $this->setUser($teacher);
-        $this->setUser($teacher);
+        $assign = $this->create_instance($course, [
-        $assign = $this->create_instance($course, [
+            'name' => 'Escaping & Unescaping',
             'sendstudentnotifications' => 1,
         $this->expectOutputRegex('/Done processing 1 assignment submissions/');
         \assign::cron();
         $messages = $sink->get_messages();
+        $this->assertEquals(1, count($messages));
+        // Get some bits we will need to verify the content of the message.
+        $assignname = $assign->get_instance()->name;
+        $assignurl = (new \moodle_url('/mod/assign/view.php', ['id' => $assign->get_course_module()->id]))->out();
+        $teachername = fullname($teacher);
+        $assignsurl = (new \moodle_url('/mod/assign/index.php', ['id' => $course->id]))->out();
+        $courseurl = (new \moodle_url('/course/view.php', ['id' => $course->id]))->out();
-        $this->assertEquals(1, count($messages));
+        $message = $messages[0];
-        $this->assertEquals(1, $messages[0]->notification);
+        $this->assertEquals(1, $message->notification);
+        $this->assertEquals(format_string($assign->get_instance()->name), $message->contexturlname);
+        $this->assertEquals("$teachername has given feedback for assignment $assignname", $message->subject, );
+        $this->assertEquals("E&U -> Assignment -> Escaping & Unescaping
+---------------------------------------------------------------------
+$teachername has posted some feedback on your
+assignment submission for 'Escaping & Unescaping'
+You can see it appended to your assignment submission:
+    $assignurl
+---------------------------------------------------------------------
+",
+            $message->fullmessage,
+        );
+        $this->assertEquals(
+            '<p><font face="sans-serif">
+    <a href="' . $courseurl . '">E&amp;U</a> ->
+    <a href="' . $assignsurl . '">Assignment</a> ->
+    <a href="' . $assignurl . '">Escaping &amp; Unescaping</a>
+</font></p>
+<hr>
+<font face="sans-serif"><p>' . $teachername . ' has posted some feedback on your ' .
+            'assignment submission for \'Escaping &amp; Unescaping\'.
+You can see it appended to your <a href="' . $assignurl .
+            '">assignment submission</a>.</p></font>
+<hr>',
+            $message->fullmessagehtml
-        $this->assertEquals($assign->get_instance()->name, $messages[0]->contexturlname);
+        );
+    }
         $this->assertFalse($assign->can_grade($student->id));
         // Test the viewgrades capability - without mod/assign:grade.
         $this->setUser($student);
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'));
+        $studentrole = $DB->get_record('role', ['shortname' => 'student']);
         assign_capability('mod/assign:viewgrades', CAP_ALLOW, $studentrole->id, $assign->get_context()->id);
         $this->assertEquals(false, $assign->can_grade());
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $editingteacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $otherstudent = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $suspendedstudent = $this->getDataGenerator()->create_and_enrol(
+            $course,
+            'student',
+            null,
+            'manual',
+,
+,
-            $course, 'student', null, 'manual', 0, 0, ENROL_USER_SUSPENDED);
+            ENROL_USER_SUSPENDED
+        );
         $assign = $this->create_instance($course);
         $this->assertEquals(true, $assign->can_view_submission($teacher->id));
         $this->assertEquals(true, $assign->can_view_submission($suspendedstudent->id));
         // Test the viewgrades capability - without mod/assign:grade.
         $this->setUser($student);
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'));
+        $studentrole = $DB->get_record('role', ['shortname' => 'student']);
         assign_capability('mod/assign:viewgrades', CAP_ALLOW, $studentrole->id, $assign->get_context()->id);
         $this->assertEquals(true, $assign->can_view_submission($student->id));
         $this->assertEquals(true, $assign->can_view_submission($otherstudent->id));
         $this->assertEquals(true, $assign->can_view_submission($teacher->id));
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $editingteacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $otherstudent = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $suspendedstudent = $this->getDataGenerator()->create_and_enrol(
+            $course,
+            'student',
+            null,
+            'manual',
+,
+,
-            $course, 'student', null, 'manual', 0, 0, ENROL_USER_SUSPENDED);
+            ENROL_USER_SUSPENDED
+        );
         $this->setAdminUser();
         $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $editingteacher = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $otherstudent = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_add_member($group1, $student);
         $this->setAdminUser();
         // Force create an assignment with SEPARATEGROUPS.
         $group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         global $CFG, $DB;
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group1->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group1->id, 'groupingid' => $grouping->id]);
         $otherstudent = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $capability = 'mod/assign:receivegradernotifications';
         $coursecontext = \context_course::instance($course->id);
-        $role = $DB->get_record('role', array('shortname' => 'teacher'));
+        $role = $DB->get_record('role', ['shortname' => 'teacher']);
         $this->setUser($teacher);
         global $CFG, $DB;
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
-        $this->getDataGenerator()->create_grouping_group(array('groupid' => $group1->id, 'groupingid' => $grouping->id));
+        $this->getDataGenerator()->create_grouping_group(['groupid' => $group1->id, 'groupingid' => $grouping->id]);
         global $CFG;
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         $this->getDataGenerator()->create_grouping_group([
             'groupid' => $group1->id,
         $output = $assign->view_student_summary($student, true);
         $this->assertMatchesRegularExpression('/Feedback/', $output, 'Show feedback if there is a grade');
         // Now hide the grade in gradebook.
         $this->setUser($teacher);
-        require_once($CFG->libdir.'/gradelib.php');
+        require_once($CFG->libdir . '/gradelib.php');
-        $gradeitem = new \grade_item(array(
+        $gradeitem = new \grade_item([
             'itemtype'      => 'mod',
             'itemmodule'    => 'assign',
             'iteminstance'  => $assign->get_instance()->id,
-            'courseid'      => $course->id));
+            'courseid'      => $course->id]);
         $gradeitem->set_hidden(1, false);
         // No feedback should be available because the grade is hidden.
+        $this->setUser($student);
+        $output = $assign->view_student_summary($student, true);
-        $this->setUser($student);
+        $this->assertDoesNotMatchRegularExpression(
+            '/Feedback/',
-        $output = $assign->view_student_summary($student, true);
+            $output,
-        $this->assertDoesNotMatchRegularExpression('/Feedback/', $output,
+            'Do not show feedback if the grade is hidden in the gradebook'
-            'Do not show feedback if the grade is hidden in the gradebook');
+        );
         // Freeze the context.
         $this->setAdminUser();
         $context = $assign->get_context();
         $CFG->contextlocking = true;
+        $context->set_locked(true);
+        // No feedback should be available because the grade is hidden.
-        $context->set_locked(true);
+        $this->setUser($student);
+        $output = $assign->view_student_summary($student, true);
         $this->assertDoesNotMatchRegularExpression(
-        // No feedback should be available because the grade is hidden.
+            '/Feedback/',
-        $this->setUser($student);
+            $output,
         $course = $this->getDataGenerator()->create_course();
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $this->setUser($teacher);
         $assign = $this->create_instance($course, [
-            'assignfeedback_comments_enabled' => 1
+            'assignfeedback_comments_enabled' => 1,
         ]);
         $PAGE->set_url(new \moodle_url('/mod/assign/view.php', ['id' => $assign->get_course_module()->id]));
         // No feedback should be available because this student has not been graded.
         $this->assertMatchesRegularExpression('/Grade/', $output);
         $this->assertMatchesRegularExpression('/Graded on/', $output);
         // Now hide the grade in gradebook.
         $this->setUser($teacher);
-        $gradeitem = new \grade_item(array(
+        $gradeitem = new \grade_item([
             'itemtype'      => 'mod',
             'itemmodule'    => 'assign',
             'iteminstance'  => $assign->get_instance()->id,
-            'courseid'      => $course->id));
+            'courseid'      => $course->id]);
         $gradeitem->set_hidden(1, false);
         // No feedback should be available because the grade is hidden.
+        $this->setUser($student);
+        $output = $assign->view_student_summary($student, true);
-        $this->setUser($student);
+        $this->assertDoesNotMatchRegularExpression(
+            '/Feedback/',
-        $output = $assign->view_student_summary($student, true);
+            $output,
-        $this->assertDoesNotMatchRegularExpression('/Feedback/', $output,
+            'Do not show feedback if the grade is hidden in the gradebook'
-            'Do not show feedback if the grade is hidden in the gradebook');
+        );
+    }
         // Add a second submission.
         $this->add_submission($student, $assign);
         $this->submit_for_grading($student, $assign);
-        // Mark the submission as passing.
+        // Mark the second submission as passing.
-        $this->mark_submission($teacher, $assign, $student, 80.0);
+        $this->mark_submission($teacher, $assign, $student, 80.0, [], 1);
         // Check that the student does not have a button for Add a new attempt.
         $this->setUser($student);
         $output = $assign->view_student_summary($student, true);
         $this->assertEquals(false, strpos($output, get_string('addnewattempt', 'assign')));
-        // Re-mark the submission as not passing.
+        // Re-mark the second submission as not passing.
         $output = $assign->view_student_summary($student, true);
         $this->assertEquals(false, strpos($output, get_string('addnewattempt', 'assign')));
+    }
+    /**
+     * Test reopen behavior when in "Automatic" mode.
+     *
+     * @coversNothing
+     */
+    public function test_attempt_reopen_method_automatic(): void {
+        global $PAGE;
+        $this->resetAfterTest();
+        $course = $this->getDataGenerator()->create_course();
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
+        $assign = $this->create_instance($course, [
+            'attemptreopenmethod' => ASSIGN_ATTEMPT_REOPEN_METHOD_AUTOMATIC,
+            'maxattempts' => 3,
+            'submissiondrafts' => 1,
+            'assignsubmission_onlinetext_enabled' => 1,
+        ]);
+        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', ['id' => $assign->get_course_module()->id]));
+        // Set grade to pass to 80.
+        $gradeitem = $assign->get_grade_item();
+        $gradeitem->gradepass = '80.0';
+        $gradeitem->update();
+        // Student should be able to see an add submission button.
+        $this->setUser($student);
+        $output = $assign->view_submission_action_bar($assign->get_instance(), $student);
+        $this->assertNotEquals(false, strpos($output, get_string('addsubmission', 'assign')));
+        // Add a submission as a student.
+        $this->add_submission($student, $assign);
+        $this->submit_for_grading($student, $assign);
+        // Verify the student cannot make a new attempt.
+        $output = $assign->view_student_summary($student, true);
+        $this->assertEquals(false, strpos($output, get_string('addnewattempt', 'assign')));
+        // Mark the submission as non-passing.
+        $this->mark_submission($teacher, $assign, $student, 50.0);
+        // Check the student now has a button for Add a new attempt.
+        $this->setUser($student);
+        $output = $assign->view_submission_action_bar($assign->get_instance(), $student);
+        $this->assertNotEquals(false, strpos($output, get_string('addnewattempt', 'assign')));
+        // Add a second submission.
+        $this->add_submission($student, $assign);
+        $this->submit_for_grading($student, $assign);
+        // Mark the submission as passing.
+        $this->mark_submission($teacher, $assign, $student, 80.0, [], 1);
+        // Check the student now has a button for Add a new attempt.
+        $this->setUser($student);
+        $output = $assign->view_submission_action_bar($assign->get_instance(), $student);
+        $this->assertNotEquals(false, strpos($output, get_string('addnewattempt', 'assign')));
+    }
     /**
      * Test student visibility for each stage of the marking workflow.
      */
     public function test_markingworkflow(): void {
         ]);
         $PAGE->set_url(new \moodle_url('/mod/assign/view.php', ['id' => $assign->get_course_module()->id]));
         // Mark the submission and set to notmarked.
-        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+        $this->mark_submission($teacher, $assign, $student, 50.0, [
             'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_NOTMARKED,
         ]);
         // Make sure the grade isn't pushed to the gradebook.
         $grades = $assign->get_user_grades_for_gradebook($student->id);
         $this->assertEmpty($grades);
         // Mark the submission and set to inmarking.
-        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+        $this->mark_submission($teacher, $assign, $student, 50.0, [
             'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_INMARKING,
         ]);
         // Make sure the grade isn't pushed to the gradebook.
         $grades = $assign->get_user_grades_for_gradebook($student->id);
         $this->assertEmpty($grades);
         // Mark the submission and set to readyforreview.
-        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+        $this->mark_submission($teacher, $assign, $student, 50.0, [
             'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_READYFORREVIEW,
         ]);
         // Make sure the grade isn't pushed to the gradebook.
         $grades = $assign->get_user_grades_for_gradebook($student->id);
         $this->assertEmpty($grades);
         // Mark the submission and set to inreview.
-        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+        $this->mark_submission($teacher, $assign, $student, 50.0, [
             'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_INREVIEW,
         ]);
         // Make sure the grade isn't pushed to the gradebook.
         $grades = $assign->get_user_grades_for_gradebook($student->id);
         $this->assertEmpty($grades);
         // Mark the submission and set to readyforrelease.
-        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+        $this->mark_submission($teacher, $assign, $student, 50.0, [
             'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_READYFORRELEASE,
         ]);
         // Make sure the grade isn't pushed to the gradebook.
         $grades = $assign->get_user_grades_for_gradebook($student->id);
         $this->assertEmpty($grades);
         // Mark the submission and set to released.
-        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+        $this->mark_submission($teacher, $assign, $student, 50.0, [
             'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_RELEASED,
         ]);
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $otherteacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $assign = $this->create_instance($course, [
             'markingworkflow' => 1,
-            'markingallocation' => 1
+            'markingallocation' => 1,
         ]);
             'assignsubmission_onlinetext_enabled' => 1,
         ]);
         $this->setUser($student);
+        $output = $assign->view_student_summary($student, true);
+        $this->assertStringNotContainsString(
-        $output = $assign->view_student_summary($student, true);
+            $output,
-        $this->assertStringNotContainsString($output, get_string('editsubmission', 'assign'),
+            get_string('editsubmission', 'assign'),
+            'Should not be able to edit after cutoff date.'
+        );
+        $this->assertStringNotContainsString(
-            'Should not be able to edit after cutoff date.');
+            $output,
-        $this->assertStringNotContainsString($output, get_string('submitassignment', 'assign'),
+            get_string('submitassignment', 'assign'),
+            'Should not be able to submit after cutoff date.'
-            'Should not be able to submit after cutoff date.');
+        );
+    }
     /**
         $assign = $this->create_instance($course, $instanceconfig);
         $plugin = $assign->get_submission_plugin_by_type('comments');
         $this->assertEquals($isenabled, (bool) $plugin->is_enabled('enabled'));
+    }
+    /**
+     * Data provider for test_submission_comment_plugin_settings.
+     *
+     * @return array[]
+     */
-    public function submission_plugin_settings_provider() {
+    public static function submission_plugin_settings_provider(): array {
         return [
             'CFG->usecomments true, empty config => Enabled by default' => [
                 true,
                 [],
             'rownum' => 0,
             'last' => true,
             'useridlistid' => $assign->get_useridlist_key_id(),
             'attemptnumber' => 0,
         ];
-        $formparams = array($assign, $data, $pagination);
+        $formparams = [$assign, $data, $pagination];
         $mform = new mod_assign_grade_form(null, [$assign, $data, $pagination]);
         // We need to get the URL these will be transformed to.
         $context = \context_user::instance($USER->id);
         $assign = $this->create_instance($course, $instanceconfig);
         $plugin = $assign->get_feedback_plugin_by_type('comments');
         $this->assertEquals($isenabled, (bool) $plugin->is_enabled('enabled'));
+    }
+    /**
+     * Data provider for test_feedback_plugin_settings.
+     *
+     * @return array[]
+     */
-    public function feedback_plugin_settings_provider() {
+    public static function feedback_plugin_settings_provider(): array {
         return [
             'No configuration => disabled' => [
                 [],
                 false,
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student3 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student4 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_assign_grouping($grouping->id, $group1->id);
         groups_add_member($group1, $student1);
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student3 = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $student4 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $student4 = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $student5 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_assign_grouping($grouping->id, $group1->id);
         $assign = $this->create_instance($course, [
             'assignsubmission_onlinetext_enabled' => 1,
             'submissiondrafts' => 1,
             'groupingid' => $grouping->id,
             'groupmode' => SEPARATEGROUPS,
+            'preventsubmissionnotingroup' => 0,
         ]);
         // Add the capability to the new \assignment for student 1.
         $roleid = create_role('Dummy role', 'dummyrole', 'dummy role description');
         // Verify student1 has the ability to edit submissions for other users in their group, but not other groups.
         $this->assertTrue($assign->can_edit_submission($student1->id, $student1->id));
         $this->assertTrue($assign->can_edit_submission($student2->id, $student1->id));
         $this->assertFalse($assign->can_edit_submission($student3->id, $student1->id));
         $this->assertFalse($assign->can_edit_submission($student4->id, $student1->id));
+        $this->assertFalse($assign->can_edit_submission($student5->id, $student1->id));
         // Verify other students do not have the ability to edit submissions for other users.
         $this->assertTrue($assign->can_edit_submission($student2->id, $student2->id));
         $this->assertFalse($assign->can_edit_submission($student1->id, $student2->id));
         $this->assertFalse($assign->can_edit_submission($student3->id, $student2->id));
+        $this->assertFalse($assign->can_edit_submission($student4->id, $student2->id));
+        $this->assertFalse($assign->can_edit_submission($student5->id, $student2->id));
+        // Add the required capability to edit other submissions and to view all groups to the teacher.
+        $roleid = create_role('Dummy role 2', 'dummyrole2', 'dummy role description');
+        assign_capability('mod/assign:editothersubmission', CAP_ALLOW, $roleid, $assign->get_context()->id);
+        assign_capability('moodle/site:accessallgroups', CAP_ALLOW, $roleid, $assign->get_context()->id);
+        role_assign($roleid, $teacher->id, $assign->get_context()->id);
+        // Verify the teacher has the ability to edit submissions for other users including users not in a group.
+        $this->assertTrue($assign->can_edit_submission($student1->id, $teacher->id));
+        $this->assertTrue($assign->can_edit_submission($student2->id, $teacher->id));
+        $this->assertTrue($assign->can_edit_submission($student3->id, $teacher->id));
+        $this->assertTrue($assign->can_edit_submission($student4->id, $teacher->id));
-        $this->assertFalse($assign->can_edit_submission($student4->id, $student2->id));
+        $this->assertTrue($assign->can_edit_submission($student5->id, $teacher->id));
+    }
     /**
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student3 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student4 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_assign_grouping($grouping->id, $group1->id);
         groups_add_member($group1, $student1);
         $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student2 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student3 = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $student4 = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_assign_grouping($grouping->id, $group1->id);
         groups_add_member($group1, $student1);
                 continue;
+            }
             $fileareas = $plugin->get_file_areas();
             if ($type == 'onlinetext') {
-                $this->assertEquals(array('submissions_onlinetext' => 'Online text'), $fileareas);
+                $this->assertEquals(['submissions_onlinetext' => 'Online text'], $fileareas);
                 $usingfilearea++;
             } else if ($type == 'file') {
-                $this->assertEquals(array('submission_files' => 'File submissions'), $fileareas);
+                $this->assertEquals(['submission_files' => 'File submissions'], $fileareas);
                 $usingfilearea++;
             } else {
                 $this->assertEmpty($fileareas);
+            }
                     'importhtml' => 'Annotate PDF',
                     'pages' => 'Annotate PDF',
                     'readonlypages' => 'Annotate PDF',
                     'stamps' => 'Annotate PDF',
                     'tmp_jpg_to_pdf' => 'Annotate PDF',
-                    'tmp_rotated_jpg' => 'Annotate PDF'
+                    'tmp_rotated_jpg' => 'Annotate PDF',
                 ];
                 $this->assertEquals($checkareas, $fileareas);
                 $usingfilearea++;
             } else if ($type == 'file') {
-                $this->assertEquals(array('feedback_files' => 'Feedback files'), $fileareas);
+                $this->assertEquals(['feedback_files' => 'Feedback files'], $fileareas);
                 $usingfilearea++;
             } else if ($type == 'comments') {
-                $this->assertEquals(array('feedback' => 'Feedback comments'), $fileareas);
+                $this->assertEquals(['feedback' => 'Feedback comments'], $fileareas);
                 $usingfilearea++;
             } else {
                 $this->assertEmpty($fileareas);
+            }
+        }
         $this->resetAfterTest();
         $course = $this->getDataGenerator()->create_course();
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         $group2 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
                 'userid' => null,
                 'sortorder' => 1,
                 'allowsubmissionsfromdate' => 1,
                 'duedate' => 2,
                 'cutoffdate' => 3,
-                'timelimit' => null
+                'timelimit' => null,
             ],
             (object) [
                 // Override for group 2, lower priority (numerically higher sortorder).
                 'assignid' => $instance->id,
                 'groupid' => $group2->id,
                 'userid' => null,
                 'sortorder' => 2,
                 'allowsubmissionsfromdate' => 5,
                 'duedate' => 6,
                 'cutoffdate' => 6,
-                'timelimit' => null
+                'timelimit' => null,
             ],
             (object) [
                 // User override.
                 'assignid' => $instance->id,
                 'groupid' => null,
                 'userid' => $student3->id,
                 'sortorder' => null,
                 'allowsubmissionsfromdate' => 7,
                 'duedate' => 8,
                 'cutoffdate' => 9,
-                'timelimit' => null
+                'timelimit' => null,
             ],
         ];
         foreach ($overrides as &$override) {
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $teacher->ignoresesskey = true;
         $this->setUser($teacher);
+        $assign = $this->create_instance($course, [
-        $assign = $this->create_instance($course, [
+                'maxattempts' => ASSIGN_UNLIMITED_ATTEMPTS,
                 'attemptreopenmethod' => ASSIGN_ATTEMPT_REOPEN_METHOD_MANUAL,
             ]);
         $grade = $assign->get_user_grade($student->id, false);
         $this->assertEquals(60.0, $grade->grade);
         // Attempt to grade with a past attempts grade info.
         $assign->testable_process_add_attempt($student->id);
-        $data = array(
+        $data = [
             'grademodified_' . $student->id => $grade->timemodified,
             'gradeattempt_' . $student->id => $grade->attemptnumber,
-            'quickgrade_' . $student->id => '50.0'
+            'quickgrade_' . $student->id => '50.0',
-        );
+        ];
         $result = $assign->testable_process_save_quick_grades($data);
         $this->assertStringContainsString(get_string('errorrecordmodified', 'assign'), $result);
         $grade = $assign->get_user_grade($student->id, false);
         $this->assertFalse($grade);
         // Attempt to grade a the attempt.
         $submission = $assign->get_user_submission($student->id, false);
-        $data = array(
+        $data = [
             'grademodified_' . $student->id => '',
             'gradeattempt_' . $student->id => $submission->attemptnumber,
-            'quickgrade_' . $student->id => '40.0'
+            'quickgrade_' . $student->id => '40.0',
-        );
+        ];
         $result = $assign->testable_process_save_quick_grades($data);
         $this->assertStringContainsString(get_string('quickgradingchangessaved', 'assign'), $result);
         $grade = $assign->get_user_grade($student->id, false);
         $this->assertEquals(40.0, $grade->grade);
         // Catch grade update conflicts.
         // Save old data for later.
         $pastdata = $data;
         // Update the grade the 'good' way.
-        $data = array(
+        $data = [
             'grademodified_' . $student->id => $grade->timemodified,
             'gradeattempt_' . $student->id => $grade->attemptnumber,
-            'quickgrade_' . $student->id => '30.0'
+            'quickgrade_' . $student->id => '30.0',
-        );
+        ];
         $result = $assign->testable_process_save_quick_grades($data);
         $completiondata = $completion->get_data($cm, false, $student->id);
         $this->assertEquals(0, $completiondata->completionstate);
         // Update to mark as complete.
         $submission = $assign->get_user_submission($student->id, true);
+        $assign->testable_update_activity_completion_records(
+,
+,
+            $submission,
-        $assign->testable_update_activity_completion_records(0, 0, $submission,
+            $student->id,
+            COMPLETION_COMPLETE,
+            $completion
-            $student->id, COMPLETION_COMPLETE, $completion);
+        );
         // Completion should now be met.
         $completiondata = $completion->get_data($cm, false, $student->id);
         $course = $this->getDataGenerator()->create_course(['enablecompletion' => 1]);
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $otherstudent = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         $course = $this->getDataGenerator()->create_course(['enablecompletion' => 1]);
         $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
         $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
         $otherstudent = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        $grouping = $this->getDataGenerator()->create_grouping(array('courseid' => $course->id));
+        $grouping = $this->getDataGenerator()->create_grouping(['courseid' => $course->id]);
         $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_add_member($group1, $student);
         groups_add_member($group1, $otherstudent);
         $assign = $this->create_instance($course, [
             'submissiondrafts' => 0,
             'completion' => COMPLETION_TRACKING_AUTOMATIC,
             'completionsubmit' => 1,
             'teamsubmission' => 1,
-            'assignsubmission_onlinetext_enabled' => 1
+            'assignsubmission_onlinetext_enabled' => 1,
     /**
      * Data provider for test_fix_null_grades
      * @return array[] Test data for test_fix_null_grades. Each element should contain grade, expectedcount and gradebookvalue
      */
-    public function fix_null_grades_provider() {
+    public static function fix_null_grades_provider(): array {
         return [
             'Negative less than one is errant' => [
                 'grade' => -0.64,
                 'gradebookvalue' => null,
         $assigntemp->cmidnumber = $assign->get_course_module()->idnumber;
         assign_update_grades($assigntemp);
         // Check that the gradebook was updated with the assign grade. So we can guarentee test results later on.
         $expectedgrade = $grade == -1 ? null : $grade; // Assign sends null to the gradebook for -1 grades.
-        $gradegrade = \grade_grade::fetch(array('userid' => $student->id, 'itemid' => $assign->get_grade_item()->id));
+        $gradegrade = \grade_grade::fetch(['userid' => $student->id, 'itemid' => $assign->get_grade_item()->id]);
         $this->assertEquals(-1, $gradegrade->usermodified);
         $this->assertEquals($expectedgrade, $gradegrade->rawgrade);
         // Call fix_null_grades().
         $method = new \ReflectionMethod(\assign::class, 'fix_null_grades');
         $result = $method->invoke($assign);
         $this->assertSame(true, $result);
         $course = $this->getDataGenerator()->create_course();
         $assign = $this->create_instance($course);
         $valid = $assign->get_filters();
-        $this->assertEquals(count($valid), 6);
+        $this->assertEquals(count($valid), 7);
+    }
      * @param array $courseconfig the config to use when creating the course.
      * @param array $assignconfig the config to use when creating the assignment.
      * @param array $enrolconfig the config to use when enrolling the user (this will be the active user).
      * @param array $expectedproperties an map containing the expected names and values for the assign instance data.
      */
-    public function test_assign_get_instance(array $courseconfig, array $assignconfig, array $enrolconfig,
+    public function test_assign_get_instance(
+        array $courseconfig,
+        array $assignconfig,
+        array $enrolconfig,
-            array $expectedproperties): void {
+        array $expectedproperties
+    ): void {
         $this->resetAfterTest();
         set_config('enablecourserelativedates', true); // Enable relative dates at site level.
+        }
+    }
     /**
+     * The test_assign_get_instance data provider.
+     *
-     * The test_assign_get_instance data provider.
+     * @return array[]
      */
-    public function assign_get_instance_provider() {
+    public static function assign_get_instance_provider(): array {
         $timenow = time();
         // The get_default_instance() method shouldn't calculate any properties per-user. It should just return the record data.
         // We'll confirm this works for a few different user types anyway, just like we do for get_instance().
         return [
             'Teacher whose enrolment starts after the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'teacher', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 6 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 6 * DAYSECS],
             ],
             'Teacher whose enrolment starts before the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'teacher', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 12 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
             'Teacher whose enrolment starts after the course start date, relative dates mode disabled' => [
                 'courseconfig' => ['relativedatesmode' => false, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'teacher', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
             'Student whose enrolment starts after the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'student', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 6 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 6 * DAYSECS],
             ],
             'Student whose enrolment starts before the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'student', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 12 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
             'Student whose enrolment starts after the course start date, relative dates mode disabled' => [
                 'courseconfig' => ['relativedatesmode' => false, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'student', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
         ];
      * @param array $courseconfig the config to use when creating the course.
      * @param array $assignconfig the config to use when creating the assignment.
      * @param array $enrolconfig the config to use when enrolling the user (this will be the active user).
      * @param array $expectedproperties an map containing the expected names and values for the assign instance data.
      */
-    public function test_assign_get_default_instance(array $courseconfig, array $assignconfig, array $enrolconfig,
+    public function test_assign_get_default_instance(
+        array $courseconfig,
+        array $assignconfig,
+        array $enrolconfig,
-            array $expectedproperties): void {
+        array $expectedproperties
+    ): void {
         $this->resetAfterTest();
         set_config('enablecourserelativedates', true); // Enable relative dates at site level.
+        }
+    }
     /**
+     * The test_assign_get_default_instance data provider.
+     *
-     * The test_assign_get_default_instance data provider.
+     * @return array[]
      */
-    public function assign_get_default_instance_provider() {
+    public static function assign_get_default_instance_provider(): array {
         $timenow = time();
         // The get_default_instance() method shouldn't calculate any properties per-user. It should just return the record data.
         // We'll confirm this works for a few different user types anyway, just like we do for get_instance().
         return [
             'Teacher whose enrolment starts after the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'teacher', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
             'Teacher whose enrolment starts before the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'teacher', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 12 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
             'Teacher whose enrolment starts after the course start date, relative dates mode disabled' => [
                 'courseconfig' => ['relativedatesmode' => false, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'teacher', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
             'Student whose enrolment starts after the course start date, relative dates mode enabled' => [
                 'courseconfig' => ['relativedatesmode' => true, 'startdate' => $timenow - 10 * DAYSECS],
                 'assignconfig' => ['duedate' => $timenow + 4 * DAYSECS],
                 'enrolconfig' => ['shortname' => 'student', 'userparams' => null, 'method' => 'manual',
                     'startdate' => $timenow - 8 * DAYSECS],
-                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS]
+                'expectedproperties' => ['duedate' => $timenow + 4 * DAYSECS],
             ],
         ];
         // Set last run time 2 days ago.
         $DB->set_field('task_scheduled', 'lastruntime', time() - 2 * DAYSECS, ['classname' => '\mod_assign\task\cron_task']);
         // Remove events to make sure cron will update calendar and re-create one of them.
-        $params = array('modulename' => 'assign', 'instance' => $assign1->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign1->get_instance()->id];
         $DB->delete_records('event', $params);
-        $params = array('modulename' => 'assign', 'instance' => $assign2->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign2->get_instance()->id];
         $DB->delete_records('event', $params);
         // Run cron.
         \assign::cron();
         // Assert that calendar hasn't been updated for the first assignment as it's supposed to be
         // updated as part of previous cron runs (allowsubmissionsfromdate is less than lastruntime).
-        $params = array('modulename' => 'assign', 'instance' => $assign1->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign1->get_instance()->id];
         $event1 = $DB->get_record('event', $params);
         $this->assertEmpty($event1);
         // Assert that calendar has been updated for the second assignment
         // because its allowsubmissionsfromdate is greater than lastruntime.
-        $params = array('modulename' => 'assign', 'instance' => $assign2->get_instance()->id);
+        $params = ['modulename' => 'assign', 'instance' => $assign2->get_instance()->id];
-        $event2 = $DB->get_record('event', $params);
-        $this->assertNotEmpty($event2);
-        $this->assertSame('This one should be re-created', $event2->description);
-    }
-    /**
-     * Test submissions that need grading output after one ungraded submission
-     */
-    public function test_submissions_need_grading(): void {
-        global $PAGE;
-        $this->resetAfterTest();
-        $course = $this->getDataGenerator()->create_course();
-        $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
-        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
-        // Setup the assignment.
-        $this->setUser($teacher);
-        $time = time();
-        $assign = $this->create_instance($course, [
-                'assignsubmission_onlinetext_enabled' => 1,
-            ]);
-        $PAGE->set_url(new \moodle_url('/mod/assign/view.php', [
-            'id' => $assign->get_course_module()->id,
-            'action' => 'grading',
-        ]));
-        // Check for 0 submissions.
-        $summary = $assign->view('viewcourseindex');
-        $this->assertStringContainsString('/mod/assign/view.php?id=' .
-            $assign->get_course_module()->id . '&amp;action=grading">' .
-            get_string('numberofsubmissionsneedgradinglabel', 'assign', 0) . '</a>', $summary);
-        // Simulate an assignment submission.
-        $this->setUser($student);
-        $submission = $assign->get_user_submission($student->id, true);
-        $submission->status = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
-        $assign->testable_update_submission($submission, $student->id, true, false);
-        $data = new \stdClass();
-        $data->onlinetext_editor = [
-            'itemid' => file_get_unused_draft_itemid(),
-            'text' => 'Submission text',
-            'format' => FORMAT_MOODLE,
-        ];
-        $plugin = $assign->get_submission_plugin_by_type('onlinetext');
-        $plugin->save($submission, $data);
-        // Check for 1 ungraded submission.
-        $this->setUser($teacher);
-        $summary = $assign->view('viewcourseindex');
-        $this->assertStringContainsString('/mod/assign/view.php?id=' .
+        $event2 = $DB->get_record('event', $params);
-            $assign->get_course_module()->id .  '&amp;action=grading">' .
+        $this->assertNotEmpty($event2);
-            get_string('numberofsubmissionsneedgradinglabel', 'assign', 1) . '</a>', $summary);
+        $this->assertSame('This one should be re-created', $event2->description);
+    }
     /**
      * Test that attachments should not be provided if \assign->show_intro returns false.
      *
      * @covers \assign::should_provide_intro_attachments
      */
     public function test_should_provide_intro_attachments_with_show_intro_disabled(): void {
         $this->resetAfterTest();
         $futuredate = time() + 300;
+     *
      * @covers \assign::should_provide_intro_attachments
      */
     public function test_should_provide_intro_attachments_with_bypass_capability(): void {
         $this->resetAfterTest();
-        list($assign, $instance, $student) = $this->create_submission([
+        [$assign, $instance, $student] = $this->create_submission([
             'submissionattachments' => 1,
         ]);
         // Provide teaching role to student1 so they are able to bypass time limit restrictions on viewing attachments.
         $this->getDataGenerator()->enrol_user($student->id, $instance->course, 'editingteacher');
         $this->assertTrue($assign->should_provide_intro_attachments($student->id));
+     *
      * @covers \assign::should_provide_intro_attachments
      */
     public function test_should_provide_intro_attachments_with_submissionattachments_disabled(): void {
         $this->resetAfterTest();
-        list($assign, $instance, $student) = $this->create_submission();
+        [$assign, $instance, $student] = $this->create_submission();
         $this->assertTrue($assign->should_provide_intro_attachments($student->id));
+    }
     /**
      * @covers \assign::should_provide_intro_attachments
      */
     public function test_should_provide_intro_attachments_with_submissionattachments_enabled_and_submissions_closed(): void {
         $this->resetAfterTest();
         // Set cut-off date to the past.
-        list($assign, $instance, $student) = $this->create_submission([
+        [$assign, $instance, $student] = $this->create_submission([
             'timelimit' => '300',
             'submissionattachments' => 1,
             'cutoffdate' => time() - 300,
         ]);
         $this->assertFalse($assign->should_provide_intro_attachments($student->id));
      * @covers \assign::should_provide_intro_attachments
      */
     public function test_should_provide_intro_attachments_submissionattachments_enabled_and_an_open_submission(): void {
         $this->resetAfterTest();
         set_config('enabletimelimit', '1', 'assign');
-        list($assign, $instance, $student) = $this->create_submission([
+        [$assign, $instance, $student] = $this->create_submission([
             'timelimit' => '300',
             'submissionattachments' => 1,
         ]);
      */
     public function test_is_attempt_in_progress_with_open_submission(): void {
         global $DB;
         $this->resetAfterTest();
         set_config('enabletimelimit', '1', 'assign');
-        list($assign, $instance, $student) = $this->create_submission([
+        [$assign, $instance, $student] = $this->create_submission([
             'timelimit' => '300',
         ]);
         $submission = $assign->get_user_submission($student->id, true);
         // Set a timestarted.
         $submission->timestarted = time() - 300;
      * @covers \assign::is_attempt_in_progress
      */
     public function test_is_attempt_in_progress_with_open_submission_and_no_timestarted(): void {
         $this->resetAfterTest();
         set_config('enabletimelimit', '1', 'assign');
-        list($assign, $instance, $student) = $this->create_submission([
+        [$assign, $instance, $student] = $this->create_submission([
             'timelimit' => '300',
         ]);
         $assign->get_user_submission($student->id, true);
         $this->assertFalse($assign->is_attempt_in_progress());
+    }
      */
     public function test_is_attempt_in_progress_with_no_open_submission(): void {
         global $DB;
         $this->resetAfterTest();
         set_config('enabletimelimit', '1', 'assign');
-        list($assign, $instance, $student) = $this->create_submission([
+        [$assign, $instance, $student] = $this->create_submission([
             'timelimit' => '300',
         ]);
         // Clear all current submissions.
         $DB->delete_records('assign_submission', ['assignment' => $instance->id]);
         $this->assertFalse($assign->is_attempt_in_progress());
      */
     protected function create_submission(array $params = []) {
         global $DB;
         // Create a course and assignment and users.
-        $course = self::getDataGenerator()->create_course(array('groupmode' => SEPARATEGROUPS, 'groupmodeforce' => 1));
+        $course = self::getDataGenerator()->create_course(['groupmode' => SEPARATEGROUPS, 'groupmodeforce' => 1]);
         $generator = $this->getDataGenerator()->get_plugin_generator('mod_assign');
-        $params = array_merge(array(
+        $params = array_merge([
             'course' => $course->id,
             'assignsubmission_file_maxfiles' => 1,
             'assignsubmission_file_maxsizebytes' => 1024 * 1024,
             'assignsubmission_onlinetext_enabled' => 1,
             'assignsubmission_file_enabled' => 1,
             'submissiondrafts' => 1,
             'assignfeedback_file_enabled' => 1,
             'assignfeedback_comments_enabled' => 1,
             'attemptreopenmethod' => ASSIGN_ATTEMPT_REOPEN_METHOD_MANUAL,
-            'sendnotifications' => 0
+            'sendnotifications' => 0,
-        ), $params);
+        ], $params);
         set_config('submissionreceipts', 0, 'assign');
         $instance = $generator->create_instance($params);
         $cm = get_coursemodule_from_instance('assign', $instance->id);
         $context = \context_module::instance($cm->id);
         $assign = new \mod_assign_testable_assign($context, $cm, $course);
         $student = self::getDataGenerator()->create_user();
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'));
+        $studentrole = $DB->get_record('role', ['shortname' => 'student']);
         $this->getDataGenerator()->enrol_user($student->id, $course->id, $studentrole->id);
         $this->setUser($student);
         // Create a student1 with an online text submission.
         // Simulate a submission.
         $submission = $assign->get_user_submission($student->id, true);
         $data = new \stdClass();
-        $data->onlinetext_editor = array(
+        $data->onlinetext_editor = [
             'itemid' => file_get_unused_draft_itemid(),
             'text' => 'Submission text with a <a href="@@PLUGINFILE@@/intro.txt">link</a>',
-            'format' => FORMAT_MOODLE);
+            'format' => FORMAT_MOODLE];
         $draftidfile = file_get_unused_draft_itemid();
         $usercontext = \context_user::instance($student->id);
-        $filerecord = array(
+        $filerecord = [
             'contextid' => $usercontext->id,
             'component' => 'user',
             'filearea'  => 'draft',
             'itemid'    => $draftidfile,
             'filepath'  => '/',
             'filename'  => 't.txt',
-        );
+        ];
         // Reset the filter.
         set_user_preference('assign_filter', '');
         $this->AssertTrue($assign->is_userid_filtered($student1->id));
         $this->AssertTrue($assign->is_userid_filtered($student2->id));
+    }
+    /**
+     * Test get_error_messages like a public function.
+     *
+     * @covers \assign::get_error_messages
+     */
+    public function test_get_error_messages(): void {
+        $this->resetAfterTest();
+        // Generate data.
+        $course = $this->getDataGenerator()->create_course();
+        $assign = $this->create_instance($course);
+        // Get the empty error message list.
+        $result = $assign->get_error_messages();
+        $this->assertIsArray($result);
+        $this->assertEmpty($result);
+        // Generate users.
+        $teacher  = $this->getDataGenerator()->create_and_enrol($course, 'editingteacher');
+        $student1 = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        // Set the teacher as user and try to delete the user's submission to create the error.
+        $this->setUser($teacher);
+        $assign->remove_submission($student1->id);
+        // Get the created error messages.
+        $result = $assign->get_error_messages();
+        $this->assertIsArray($result);
+        $this->assertNotEmpty($result);
+    }
+    /**
+     * Test that assignment grades are pushed to the gradebook when anonymous
+     * submissions and marking workflow are enabled (MDL-83195).
+     * @covers \assign::gradebook_item_update
+     */
+    public function test_release_grade_anon(): void {
+        $this->resetAfterTest();
+        $course = $this->getDataGenerator()->create_course();
+        $teacher = $this->getDataGenerator()->create_and_enrol($course, 'teacher');
+        $student = $this->getDataGenerator()->create_and_enrol($course, 'student');
+        $assign = $this->create_instance($course, [
+            'blindmarking' => 1,
+            'markingworkflow' => 1,
+            'markinganonymous' => 1,
+        ]);
+        // Add a grade and change the workflow status to "Released".
+        $this->mark_submission($teacher, $assign, $student, 50.0,  [
+            'workflowstate' => ASSIGN_MARKING_WORKFLOW_STATE_RELEASED,
+        ]);
+        // Make sure the grade has been pushed to the gradebook.
+        $gradinginfo = grade_get_grades($course->id, 'mod', 'assign', $assign->get_instance()->id, $student->id);
+        $this->assertEquals(50, (int)$gradinginfo->items[0]->grades[$student->id]->grade);
+    }
+}

Proyectos de Subversion Moodle

(root)/mod/assign/tests/locallib_test.php – Rev 11 → 1441