diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-17 20:08:40 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-18 14:41:16 +0200 |
| commit | e06fa200b394162f2a30a481a8b1423685182863 (patch) | |
| tree | 787db396b2837193f0dc2032ce85397b42cfa678 /apps/files_trashbin/tests | |
| parent | b486f48fbca0d8659d720bd37d6422d01bc09420 (diff) | |
| download | nextcloud-server-e06fa200b394162f2a30a481a8b1423685182863.tar.gz nextcloud-server-e06fa200b394162f2a30a481a8b1423685182863.zip | |
make sure that we always use the right user
Diffstat (limited to 'apps/files_trashbin/tests')
| -rw-r--r-- | apps/files_trashbin/tests/trashbin.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index 9e29d84464b..e94a5011094 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -88,7 +88,7 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::unlink('file3.txt'); //make sure that files are in the trash bin - $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/'); + $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1); $this->assertSame(3, count($filesInTrash)); $manipulatedList = $this->manipulateDeleteTime($filesInTrash, $expiredDate); @@ -106,7 +106,7 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { $this->assertSame('file2.txt', $remainingFile['name']); // check that file1.txt and file3.txt was really deleted - $newTrashContent = OCA\Files_Trashbin\Helper::getTrashFiles('/'); + $newTrashContent = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1); $this->assertSame(1, count($newTrashContent)); $element = reset($newTrashContent); $this->assertSame('file2.txt', $element['name']); @@ -147,7 +147,7 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { \OC\Files\Filesystem::unlink('file1.txt'); //make sure that files are in the trash bin - $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/', 'mtime'); + $filesInTrash = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1, 'mtime'); $this->assertSame(3, count($filesInTrash)); $testClass = new TrashbinForTesting(); @@ -156,7 +156,7 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { // the two oldest files (file3.txt and file2.txt) should be deleted $this->assertSame(10, $sizeOfDeletedFiles); - $newTrashContent = OCA\Files_Trashbin\Helper::getTrashFiles('/'); + $newTrashContent = OCA\Files_Trashbin\Helper::getTrashFiles('/', self::TEST_TRASHBIN_USER1); $this->assertSame(1, count($newTrashContent)); $element = reset($newTrashContent); $this->assertSame('file1.txt', $element['name']); @@ -189,10 +189,10 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase { class TrashbinForTesting extends Files_Trashbin\Trashbin { public function dummyDeleteExpiredFiles($files, $limit) { // dummy value for $retention_obligation because it is not needed here - return parent::deleteExpiredFiles($files, $limit, 0); + return parent::deleteExpiredFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $limit, 0); } public function dummyDeleteFiles($files, $availableSpace) { - return parent::deleteFiles($files, $availableSpace); + return parent::deleteFiles($files, \Test_Trashbin::TEST_TRASHBIN_USER1, $availableSpace); } } |