From c9ca068427e3adfcd7411dafbcc15632415d65d0 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 31 Mar 2015 20:32:50 +0200 Subject: [PATCH] keyManagerTest: remove code which is no longer needed --- apps/encryption/tests/lib/KeyManagerTest.php | 32 -------------------- 1 file changed, 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; @@ -27,26 +26,10 @@ class KeyManagerTest extends TestCase { * @var string */ 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(); -- 2.39.5