add unit tests
This commit is contained in:
parent
6b85fe819c
commit
9c45a3196b
|
@ -516,7 +516,7 @@ class Keymanager {
|
|||
* @param string|boolean $path
|
||||
* @param string $basePath
|
||||
*/
|
||||
public static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) {
|
||||
protected static function keySetPreparation(\OC\Files\View $view, $path, $basePath, $userId) {
|
||||
|
||||
$targetPath = ltrim($path, '/');
|
||||
|
||||
|
|
|
@ -239,11 +239,30 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
|
|||
\OC_FileProxy::$enabled = true;
|
||||
|
||||
// cleanup
|
||||
$this->view->unlink('/admin/files/folder1');
|
||||
$this->view->deleteAll('/admin/files/folder1');
|
||||
|
||||
// change encryption proxy to previous state
|
||||
\OC_FileProxy::$enabled = $proxyStatus;
|
||||
}
|
||||
|
||||
function testKeySetPreperation() {
|
||||
$basePath = '/'.Test_Encryption_Keymanager::TEST_USER.'/files';
|
||||
$path = '/folder1/subfolder/subsubfolder';
|
||||
|
||||
$this->assertFalse($this->view->is_dir($basePath . '/testKeySetPreperation'));
|
||||
|
||||
$result = TestProtectedKeymanagerMethods::testKeySetPreperation($this->view, $path, $basePath);
|
||||
|
||||
// return path without leading slash
|
||||
$this->assertSame('folder1/subfolder/subsubfolder', $result);
|
||||
|
||||
// check if directory structure was created
|
||||
$this->assertTrue($this->view->is_dir($basePath . '/folder1/subfolder/subsubfolder'));
|
||||
|
||||
// cleanup
|
||||
$this->view->deleteAll($basePath . '/folder1');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -257,4 +276,13 @@ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager {
|
|||
public static function testGetFilenameFromShareKey($sharekey) {
|
||||
return self::getFilenameFromShareKey($sharekey);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param \OC\Files\View $view relative to data/
|
||||
* @param string $path
|
||||
* @param string $basePath
|
||||
*/
|
||||
public static function testKeySetPreperation($view, $path, $basePath) {
|
||||
return self::keySetPreparation($view, $path, $basePath, '');
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue