aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-03-30 23:19:35 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:28 +0200
commite0ab2c34eab970d82ddc6c9f5b3b752243fc716a (patch)
tree4e955f621737f191d3b0be909900fa2521f97192
parente6dc6944c2cd92617818a2fd029ecdb1de5ab663 (diff)
downloadnextcloud-server-e0ab2c34eab970d82ddc6c9f5b3b752243fc716a.tar.gz
nextcloud-server-e0ab2c34eab970d82ddc6c9f5b3b752243fc716a.zip
update unit tests after ctor signature change of \OC\Encryption\Util
-rw-r--r--tests/lib/files/storage/wrapper/encryption.php5
-rw-r--r--tests/lib/files/stream/encryption.php5
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index b8d4e962c54..eea6a53e043 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -20,11 +20,14 @@ class Encryption extends \Test\Files\Storage\Storage {
->disableOriginalConstructor()
->setMethods(['getDefaultEncryptionModule', 'getEncryptionModule'])
->getMock();
+ $config = $this->getMockBuilder('\OCP\IConfig')
+ ->disableOriginalConstructor()
+ ->getMock();
$encryptionManager->expects($this->any())
->method('getDefaultEncryptionModule')
->willReturn(new DummyModule());
- $util = new \OC\Encryption\Util(new View(), new \OC\User\Manager());
+ $util = new \OC\Encryption\Util(new View(), new \OC\User\Manager(), $config);
$logger = $this->getMock('\OC\Log');
diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php
index 51ccc3de390..1c5e5cf7a49 100644
--- a/tests/lib/files/stream/encryption.php
+++ b/tests/lib/files/stream/encryption.php
@@ -23,7 +23,10 @@ class Encryption extends \Test\TestCase {
->disableOriginalConstructor()->getMock();
$encStorage = $this->getMockBuilder('\OC\Files\Storage\Wrapper\Encryption')
->disableOriginalConstructor()->getMock();
- $util = new \OC\Encryption\Util(new View(), new \OC\User\Manager());;
+ $config = $this->getMockBuilder('\OCP\IConfig')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $util = new \OC\Encryption\Util(new View(), new \OC\User\Manager(), $config);
$size = 12;
$unencryptedSize = 8000;