mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 11:46:19 +01:00
Code Issues Projects Releases Wiki Activity

MDL-81730 assignsubmission_file: deterministic submission file order.

Browse Source
This commit is contained in:
Paul Holden 2024-05-20 20:14:07 +01:00
parent bcae2164ac
commit 20d6ffb9ee
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/assign/submission/file/locallib.php
View File

@ -346,7 +346,7 @@ class assign_submission_file extends assign_submission_plugin {
'assignsubmission_file',
ASSIGNSUBMISSION_FILE_FILEAREA,
$submission->id,
'timemodified',
'timemodified, id',
false);
foreach ($files as $file) {

53
mod/assign/submission/file/tests/locallib_test.php
View File

@ -14,13 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
* Tests for mod/assign/submission/file/locallib.php
*
* @package assignsubmission_file
* @copyright 2016 Cameron Ball
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
namespace assignsubmission_file;
use mod_assign_test_generator;
@ -33,10 +26,11 @@ require_once($CFG->dirroot . '/mod/assign/tests/generator.php');
/**
* Unit tests for mod/assign/submission/file/locallib.php
*
* @package assignsubmission_file
* @copyright 2016 Cameron Ball
* @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;
@ -169,7 +163,7 @@ class locallib_test extends \advanced_testcase {
*
* @return array of testcases
*/
public function submission_is_empty_testcases() {
public static function submission_is_empty_testcases(): array {
return [
'With file' => [
[
@ -192,4 +186,45 @@ class locallib_test extends \advanced_testcase {
'Without file' => [null, true]
];
}
/**
* Test getting files from plugin submission
*/
public function test_get_files(): void {
$this->resetAfterTest();
$course = $this->getDataGenerator()->create_course();
$student = $this->getDataGenerator()->create_and_enrol($course, 'student');
$assign = $this->create_instance($course, [
'assignsubmission_file_enabled' => 1,
'assignsubmission_file_maxfiles' => 2,
'assignsubmission_file_maxsizebytes' => 512,
]);
// Switch to student, create some dummy files, and submit data to plugin.
$this->setUser($student);
$submission = $assign->get_user_submission($student->id, true);
$filerecord = [
'contextid' => $assign->get_context()->id,
'component' => 'assignsubmission_file',
'filearea' => ASSIGNSUBMISSION_FILE_FILEAREA,
'itemid' => $submission->id,
'filepath' => '/',
];
get_file_storage()->create_file_from_string($filerecord + ['filename' => 'File 1.txt'], 'File One');
get_file_storage()->create_file_from_string($filerecord + ['filename' => 'File 2.txt'], 'File Two');
/** @var \assign_submission_file $plugin */
$plugin = $assign->get_submission_plugin_by_type('file');
$plugin->save($submission, (object) []);
// Ensure we retrieve back list of file submissions, deterministically ordered.
$files = $plugin->get_files($submission, $student);
$this->assertSame([
'/File 1.txt' => 'File 1.txt',
'/File 2.txt' => 'File 2.txt',
], array_map(fn(\stored_file $f) => $f->get_filename(), $files));
}
}