mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify the test

This commit is contained in:
Joas Schilling 2015-04-27 15:23:14 +02:00 committed by Bjoern Schiessle
parent cf4a6874fb
commit 4a6808a0f4
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/encryption/lib/crypto/encryption.php
View File

@ -179,8 +179,10 @@ class Encryption implements IEncryptionModule {
try {
$publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
} catch (PublicKeyMissingException $e) {
$this->logger->warning('no public key found for user \'' . $uid .
'\', user will not be able to read the file', array('app' => 'encryption'));
$this->logger->warning(
'no public key found for user "{uid}", user will not be able to read the file',
['app' => 'encryption', 'uid' => $uid]
);
// if the public key of the owner is missing we should fail
if ($uid === $this->user) {
throw $e;

2
apps/encryption/tests/lib/crypto/cryptTest.php
View File

@ -20,7 +20,7 @@
*/
namespace OCA\Encryption\Tests\Crypt;
namespace OCA\Encryption\Tests\lib\Crypto;
use OCA\Encryption\Crypto\Crypt;

14
apps/encryption/tests/lib/crypto/encryptionTest.php
View File

@ -19,7 +19,7 @@
*
*/
namespace OCA\Encryption\Tests\Crypto;
namespace OCA\Encryption\Tests\lib\Crypto;
use OCA\Encryption\Exceptions\PublicKeyMissingException;
use Test\TestCase;
@ -92,16 +92,8 @@ class EncryptionTest extends TestCase {
*/
public function endTest() {
// prepare internal variables
$class = get_class($this->instance);
$module = new \ReflectionClass($class);
$isWriteOperation = $module->getProperty('isWriteOperation');
$writeCache = $module->getProperty('writeCache');
$isWriteOperation->setAccessible(true);
$writeCache->setAccessible(true);
$isWriteOperation->setValue($this->instance, true);
$writeCache->setValue($this->instance, '');
$isWriteOperation->setAccessible(false);
$writeCache->setAccessible(false);
\Test_Helper::invokePrivate($this->instance, 'isWriteOperation', [true]);
\Test_Helper::invokePrivate($this->instance, 'writeCache', ['']);
$this->keyManagerMock->expects($this->any())
->method('getPublicKey')