From ce78e33a8457bb33793b38f9d65a8424f7107560 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Fri, 15 Jul 2016 14:18:43 +0800
Subject: [PATCH] MDL-55174 core_tests: Use proper itemid while creating file
---
lib/tests/filelib_test.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/tests/filelib_test.php b/lib/tests/filelib_test.php
index a4a1faf5d8c..4b9a2bf1882 100644
--- a/lib/tests/filelib_test.php
+++ b/lib/tests/filelib_test.php
@@ -1025,6 +1025,7 @@ EOF;
'filename' => $filename,
);
$file = self::create_draft_file($filerecord);
+ $draftitemid = $file->get_itemid();
$maxbytes = $CFG->userquota;
$maxareabytes = $CFG->userquota;
@@ -1034,7 +1035,7 @@ EOF;
'areamaxbytes' => $maxareabytes);
// Add new file.
- file_merge_files_from_draft_area_into_filearea($file->get_itemid(), $usercontext->id, 'user', 'private', 0, $options);
+ file_merge_files_from_draft_area_into_filearea($draftitemid, $usercontext->id, 'user', 'private', 0, $options);
$files = $fs->get_area_files($usercontext->id, 'user', 'private', 0);
// Directory and file.
@@ -1051,12 +1052,12 @@ EOF;
// Add two more files.
$filerecord = array(
- 'itemid' => $file->get_itemid(),
+ 'itemid' => $draftitemid,
'filename' => 'second.txt',
);
self::create_draft_file($filerecord);
$filerecord = array(
- 'itemid' => $file->get_itemid(),
+ 'itemid' => $draftitemid,
'filename' => 'third.txt',
);
$file = self::create_draft_file($filerecord);