summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/encryption/updatetest.php2
-rw-r--r--tests/lib/files/storage/wrapper/encryption.php5
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/lib/encryption/updatetest.php b/tests/lib/encryption/updatetest.php
index 08d4125735d..790d071aa68 100644
--- a/tests/lib/encryption/updatetest.php
+++ b/tests/lib/encryption/updatetest.php
@@ -69,7 +69,7 @@ class UpdateTest extends TestCase {
->disableOriginalConstructor()->getMock();
$this->encryptionManager->expects($this->once())
- ->method('getDefaultEncryptionModule')
+ ->method('getEncryptionModule')
->willReturn($this->encryptionModule);
$this->uid = 'testUser1';
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index de43c24659e..93bf8c13e9b 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -51,12 +51,9 @@ class Encryption extends \Test\Files\Storage\Storage {
$mockModule = $this->buildMockModule();
$this->encryptionManager = $this->getMockBuilder('\OC\Encryption\Manager')
->disableOriginalConstructor()
- ->setMethods(['getDefaultEncryptionModule', 'getEncryptionModule', 'isEnabled'])
+ ->setMethods(['getEncryptionModule', 'isEnabled'])
->getMock();
$this->encryptionManager->expects($this->any())
- ->method('getDefaultEncryptionModule')
- ->willReturn($mockModule);
- $this->encryptionManager->expects($this->any())
->method('getEncryptionModule')
->willReturn($mockModule);
$this->encryptionManager->expects($this->any())