[Pkg-owncloud-commits] [owncloud] 79/215: Fix new tests

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 8f61fbb81f371cab0e13970244a47439926a6b57
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Mon Apr 27 11:10:31 2015 +0200

    Fix new tests
---
 tests/lib/encryption/updatetest.php            | 2 +-
 tests/lib/files/storage/wrapper/encryption.php | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/lib/encryption/updatetest.php b/tests/lib/encryption/updatetest.php
index 08d4125..790d071 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 de43c24..93bf8c1 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())

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git