]> source.dussan.org Git - nextcloud-server.git/commitdiff
keyManagerTest: remove code which is no longer needed
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 31 Mar 2015 18:32:50 +0000 (20:32 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 7 Apr 2015 11:30:29 +0000 (13:30 +0200)
apps/encryption/tests/lib/KeyManagerTest.php

index 98ffe85c3788194428b94820832b23b04cce0768..b4c19f5ec876b02b7a47f064dad069ee070cac29 100644 (file)
@@ -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();