[Pkg-owncloud-commits] [owncloud] 48/215: Add test "operation on keys failed"

[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 411f7893bf34507ba0b12b35a35596cd65c90b48
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Fri Apr 24 14:27:23 2015 +0200

    Add test "operation on keys failed"
---
 tests/lib/files/storage/wrapper/encryption.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index a257ca2..de43c24 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -131,13 +131,14 @@ class Encryption extends \Test\Files\Storage\Storage {
 	 *
 	 * @param string $source
 	 * @param string $target
+	 * @param boolean $renameKeysReturn
 	 * @param boolean $shouldUpdate
 	 */
-	public function testRename($source, $target, $shouldUpdate) {
+	public function testRename($source, $target, $renameKeysReturn, $shouldUpdate) {
 		$this->keyStore
 			->expects($this->once())
 			->method('renameKeys')
-			->willReturn(true);
+			->willReturn($renameKeysReturn);
 		$this->util->expects($this->any())
 			->method('isFile')->willReturn(true);
 		if ($shouldUpdate) {
@@ -158,13 +159,14 @@ class Encryption extends \Test\Files\Storage\Storage {
 	 *
 	 * @param string $source
 	 * @param string $target
+	 * @param boolean $copyKeysReturn
 	 * @param boolean $shouldUpdate
 	 */
-	public function testCopyTesting($source, $target, $shouldUpdate) {
+	public function testCopyTesting($source, $target, $copyKeysReturn, $shouldUpdate) {
 		$this->keyStore
 			->expects($this->once())
 			->method('copyKeys')
-			->willReturn(true);
+			->willReturn($copyKeysReturn);
 		$this->util->expects($this->any())
 			->method('isFile')->willReturn(true);
 		if ($shouldUpdate) {
@@ -194,9 +196,10 @@ class Encryption extends \Test\Files\Storage\Storage {
 	 */
 	public function dataTestCopyAndRename() {
 		return array(
-			array('source', 'target', false),
-			array('source', 'target', false),
-			array('source', '/subFolder/target', true),
+			array('source', 'target', false, false),
+			array('source', 'target', true, false),
+			array('source', '/subFolder/target', false, false),
+			array('source', '/subFolder/target', true, true),
 		);
 	}
 

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