summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/encryption/tests/lib/MigrationTest.php4
-rw-r--r--apps/encryption/tests/lib/crypto/encryptionTest.php3
2 files changed, 0 insertions, 7 deletions
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php
index 6edb8624e70..18f7c8b35d5 100644
--- a/apps/encryption/tests/lib/MigrationTest.php
+++ b/apps/encryption/tests/lib/MigrationTest.php
@@ -512,13 +512,9 @@ class MigrationTest extends \Test\TestCase {
*/
public function testGetTargetDir($user, $keyPath, $filename, $trash, $systemMounts, $expected) {
- $updater = $this->getMockBuilder('\OC\Files\Cache\Updater')
- ->disableOriginalConstructor()->getMock();
$view = $this->getMockBuilder('\OC\Files\View')
->disableOriginalConstructor()->getMock();
$view->expects($this->any())->method('file_exists')->willReturn(true);
- $view->expects($this->any())->method('getUpdater')->willReturn($updater);
-
$m = $this->getMockBuilder('OCA\Encryption\Migration')
->setConstructorArgs(
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index 8a228c2c215..ad20efb4451 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -142,9 +142,6 @@ class EncryptionTest extends TestCase {
$this->cryptMock->expects($this->any())
->method('multiKeyEncrypt')
->willReturn(true);
- $this->cryptMock->expects($this->any())
- ->method('setAllFileKeys')
- ->willReturn(true);
$this->instance->end('/foo/bar');
}