aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2015-03-31 20:32:50 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-04-07 13:30:29 +0200
commitc9ca068427e3adfcd7411dafbcc15632415d65d0 (patch)
tree63910e4acc1ba8d385ea3fe666b2f96e4f770ebf /apps
parent4efbcb02803bfba7844276e1f83f8ecb5c6370b7 (diff)
downloadnextcloud-server-c9ca068427e3adfcd7411dafbcc15632415d65d0.tar.gz
nextcloud-server-c9ca068427e3adfcd7411dafbcc15632415d65d0.zip
keyManagerTest: remove code which is no longer needed
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/tests/lib/KeyManagerTest.php32
1 files changed, 0 insertions, 32 deletions
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index 98ffe85c378..b4c19f5ec87 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -10,7 +10,6 @@
namespace OCA\Encryption\Tests;
-use OC\Files\View;
use OCA\Encryption\KeyManager;
use Test\TestCase;
@@ -28,25 +27,9 @@ class KeyManagerTest extends TestCase {
*/
private static $testUser = 'test-keyManager-user.dot';
/**
- * @var
- */
- private $dummyKeys;
- /**
* @var string
*/
private $userId;
- /**
- * @var string
- */
- private $userPassword;
- /**
- * @var \OC\Files\View
- */
- private $view;
- /**
- * @var string
- */
- private $dataDir;
/** @var string */
private $systemKeyId;
@@ -97,14 +80,6 @@ class KeyManagerTest extends TestCase {
$this->userId = 'user1';
$this->systemKeyId = 'systemKeyId';
$this->keyStorageMock = $this->getMock('OCP\Encryption\Keys\IStorage');
-
- /*
- $keyStorageMock->method('getUserKey')
- ->will($this->returnValue(false));
- $keyStorageMock->method('setUserKey')
- ->will($this->returnValue(true));
- */
-
$this->cryptMock = $this->getMockBuilder('OCA\Encryption\Crypto\Crypt')
->disableOriginalConstructor()
->getMock();
@@ -113,13 +88,6 @@ class KeyManagerTest extends TestCase {
->method('getAppValue')
->willReturn($this->systemKeyId);
$this->userMock = $this->getMock('OCP\IUserSession');
-
- /*
- $userMock
- ->method('getUID')
- ->will($this->returnValue('admin'));
- */
-
$this->sessionMock = $this->getMockBuilder('OCA\Encryption\Session')
->disableOriginalConstructor()
->getMock();