cleanup unused code optimize tests
This commit is contained in:
parent
f2b1158add
commit
4bf840e2ca
|
@ -18,9 +18,6 @@ OCA\Encryption\Helper::registerUserHooks();
|
||||||
// Sharing related hooks
|
// Sharing related hooks
|
||||||
OCA\Encryption\Helper::registerShareHooks();
|
OCA\Encryption\Helper::registerShareHooks();
|
||||||
|
|
||||||
// Webdav related hooks
|
|
||||||
OCA\Encryption\Helper::registerWebdavHooks();
|
|
||||||
|
|
||||||
// Filesystem related hooks
|
// Filesystem related hooks
|
||||||
OCA\Encryption\Helper::registerFilesystemHooks();
|
OCA\Encryption\Helper::registerFilesystemHooks();
|
||||||
|
|
||||||
|
|
|
@ -58,16 +58,6 @@ class Helper
|
||||||
\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
|
\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief register webdav related hooks
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public static function registerWebdavHooks()
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief register filesystem related hooks
|
* @brief register filesystem related hooks
|
||||||
*
|
*
|
||||||
|
|
|
@ -557,8 +557,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
|
||||||
|
|
||||||
function testRecoveryFile()
|
function testRecoveryFile()
|
||||||
{
|
{
|
||||||
// login as admin
|
// disable encryption proxy to prevent recursive calls
|
||||||
$this->loginHelper('admin');
|
$proxyStatus = \OC_FileProxy::$enabled;
|
||||||
|
\OC_FileProxy::$enabled = false;
|
||||||
|
|
||||||
|
$this->view->unlink('/owncloud_private_key');
|
||||||
|
$this->view->unlink('/public-keys');
|
||||||
|
|
||||||
|
\OC_FileProxy::$enabled = $proxyStatus;
|
||||||
|
|
||||||
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
|
||||||
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
|
||||||
|
@ -566,6 +572,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
|
||||||
// check if control file created
|
// check if control file created
|
||||||
$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
|
$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
|
||||||
|
|
||||||
|
// login as admin
|
||||||
|
$this->loginHelper('admin');
|
||||||
|
|
||||||
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
|
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), 'admin');
|
||||||
|
|
||||||
// check if recovery password match
|
// check if recovery password match
|
||||||
|
@ -620,6 +629,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
|
||||||
// check if share key for recovery not exists
|
// check if share key for recovery not exists
|
||||||
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
|
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
|
||||||
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
|
$this->assertFalse($this->view->file_exists('/admin/files_encryption/share-keys/' . $this->folder1 . $this->subfolder . $this->subsubfolder . '/' . $this->filename . '.' . $recoveryKeyId . '.shareKey'));
|
||||||
|
|
||||||
|
\OCA\Encryption\Helper::adminDisableRecovery('test123');
|
||||||
|
$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function testRecoveryForUser()
|
function testRecoveryForUser()
|
||||||
|
@ -689,6 +701,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase
|
||||||
|
|
||||||
// enable recovery for admin
|
// enable recovery for admin
|
||||||
$this->assertTrue($util->setRecoveryForUser(0));
|
$this->assertTrue($util->setRecoveryForUser(0));
|
||||||
|
|
||||||
|
\OCA\Encryption\Helper::adminDisableRecovery('test123');
|
||||||
|
$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function testFailShareFile()
|
function testFailShareFile()
|
||||||
|
|
Loading…
Reference in New Issue