From bdd2127f19db92d7f3eccfa0cee402add23529f6 Mon Sep 17 00:00:00 2001
From: Florin Peter <github@florin-peter.de>
Date: Sun, 19 May 2013 22:28:48 +0200
Subject: [PATCH] cleanup tests
---
apps/files_encryption/tests/crypt.php | 64 ++++++++++------------
apps/files_encryption/tests/keymanager.php | 14 ++++-
apps/files_encryption/tests/share.php | 42 ++++++++++++--
apps/files_encryption/tests/util.php | 22 +++++++-
4 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 18faaceb03..c669aec122 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -19,8 +19,25 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Crypt
+ */
class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
-
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ public $dataLong;
+ public $dataUrl;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $legacyEncryptedData;
+ public $genPrivateKey;
+ public $genPublicKey;
+
function setUp() {
// reset backend
\OC_User::clearBackends();
@@ -93,7 +110,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertTrue( strlen( $key ) > 16 );
}
-
+
+ /**
+ * @return String
+ */
function testGenerateIv() {
$iv = Encryption\Crypt::generateIv();
@@ -150,7 +170,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
}
-
+
+ /**
+ * @return string padded
+ */
function testAddPadding() {
$padded = Encryption\Crypt::addPadding( $this->dataLong );
@@ -214,34 +237,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataShort, $decrypt );
}
-
- // These aren't used for now
-// function testSymmetricBlockEncryptShortFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataShort, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataShort, $decrypt );
-//
-// }
-//
-// function testSymmetricBlockEncryptLongFileContent() {
-//
-// $crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
-//
-// $this->assertNotEquals( $this->dataLong, $crypted );
-//
-//
-// $decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
-//
-// $this->assertEquals( $this->dataLong, $decrypt );
-//
-// }
-
+
function testSymmetricStreamEncryptShortFileContent() {
$filename = 'tmp-'.time().'.test';
@@ -351,9 +347,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$decrypt = '';
// Manually decrypt chunk
- foreach ($e as $e) {
+ foreach ($e as $chunk) {
- $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $plainKeyfile );
+ $chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $chunk, $plainKeyfile );
// Assemble decrypted chunks
$decrypt .= $chunkDecrypt;
@@ -741,7 +737,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertEquals( $this->dataLong, $decrypt );
// change password
- \OC_User::setPassword($this->userId, 'test');
+ \OC_User::setPassword($this->userId, 'test', null);
// relogin
$params['uid'] = $this->userId;
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 48e370d3a5..8ca8b0287e 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -17,8 +17,20 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Keymanager
+ */
class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
-
+
+ public $userId;
+ public $pass;
+ public $stateFilesTrashbin;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $randomKey;
+
function setUp() {
// reset backend
\OC_User::clearBackends();
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index a40a992b80..de02513dea 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -32,10 +32,24 @@ require_once realpath(dirname(__FILE__) . '/../appinfo/app.php');
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Share
+ */
class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
{
- function setUp()
+ public $stateFilesTrashbin;
+ public $filename;
+ public $dataShort;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $folder1;
+ public $subfolder;
+ public $subsubfolder;
+
+ function setUp()
{
// reset backend
\OC_User::clearBackends();
@@ -106,7 +120,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
\OC_FileProxy::clearProxies();
}
- function testShareFile($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ */
+ function testShareFile($withTeardown = true)
{
// login as admin
$this->loginHelper('admin');
@@ -171,7 +188,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
}
}
- function testReShareFile($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFile($withTeardown = true)
{
$this->testShareFile(false);
@@ -228,7 +248,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
}
}
- function testShareFolder($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ * @return array
+ */
+ function testShareFolder($withTeardown = true)
{
// login as admin
$this->loginHelper('admin');
@@ -297,7 +321,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
return $fileInfo;
}
- function testReShareFolder($withTeardown = true)
+ /**
+ * @param bool $withTeardown
+ */
+ function testReShareFolder($withTeardown = true)
{
$fileInfoFolder1 = $this->testShareFolder(false);
@@ -664,6 +691,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
$this->assertTrue($util->setRecoveryForUser(false));
}
+ /**
+ * @param $user
+ * @param bool $create
+ * @param bool $password
+ */
function loginHelper($user, $create = false, $password = false)
{
if ($create) {
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 648ca2486d..53ac8ee8d6 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -16,8 +16,28 @@ require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
use OCA\Encryption;
+/**
+ * Class Test_Encryption_Util
+ */
class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
-
+
+ public $userId;
+ public $encryptionDir;
+ public $publicKeyDir;
+ public $pass;
+ /**
+ * @var OC_FilesystemView
+ */
+ public $view;
+ public $keyfilesPath;
+ public $publicKeyPath;
+ public $privateKeyPath;
+ /**
+ * @var \OCA\Encryption\Util
+ */
+ public $util;
+ public $dataShort;
+
function setUp() {
// reset backend
\OC_User::useBackend('database');
--
GitLab