summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-31 10:12:03 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-31 10:12:03 +0200
commita441220f2439b00e39edb74bdace693b729b11ac (patch)
tree80b753cd1815945213ea883853b9e0e4d8a9d6a7 /tests/lib
parent3361cdf0cc697fc3c96def63ee762360a69db783 (diff)
parentb15babd061c811e26093624ac4140c88a9e5ebcd (diff)
downloadnextcloud-server-a441220f2439b00e39edb74bdace693b729b11ac.tar.gz
nextcloud-server-a441220f2439b00e39edb74bdace693b729b11ac.zip
Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessing
[decrypt_all] Check if file needs to decrypted or not for speed up large oc setups.
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/Encryption/DecryptAllTest.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/lib/Encryption/DecryptAllTest.php b/tests/lib/Encryption/DecryptAllTest.php
index 85fbe3e0ed9..ffcbbc74a99 100644
--- a/tests/lib/Encryption/DecryptAllTest.php
+++ b/tests/lib/Encryption/DecryptAllTest.php
@@ -26,6 +26,7 @@ namespace Test\Encryption;
use OC\Encryption\DecryptAll;
use OC\Encryption\Exceptions\DecryptionFailedException;
use OC\Encryption\Manager;
+use OC\Files\FileInfo;
use OC\Files\View;
use OCP\IUserManager;
use Test\TestCase;
@@ -242,15 +243,15 @@ class DecryptAllTest extends TestCase {
$this->view->expects($this->at(0))->method('getDirectoryContent')
->with('/user1/files')->willReturn(
[
- ['name' => 'foo', 'type'=>'dir'],
- ['name' => 'bar', 'type'=>'file'],
+ new FileInfo('path', null, 'intPath', ['name' => 'foo', 'type'=>'dir'], null),
+ new FileInfo('path', null, 'intPath', ['name' => 'bar', 'type'=>'file', 'encrypted'=>true], null)
]
);
$this->view->expects($this->at(3))->method('getDirectoryContent')
->with('/user1/files/foo')->willReturn(
[
- ['name' => 'subfile', 'type'=>'file']
+ new FileInfo('path', null, 'intPath', ['name' => 'subfile', 'type'=>'file', 'encrypted'=>true], null)
]
);