summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/tests/util.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-06-18 13:26:42 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-06-18 13:26:42 +0200
commite20bb71a4241227811b2498262bc455006c6c5e1 (patch)
tree6cedd56c290f358849fb5d135364892b8ec8ab10 /apps/files_encryption/tests/util.php
parent8052d2901dfcfba8e6fb2d37e19275536324ee43 (diff)
downloadnextcloud-server-e20bb71a4241227811b2498262bc455006c6c5e1.tar.gz
nextcloud-server-e20bb71a4241227811b2498262bc455006c6c5e1.zip
remove unused code
Diffstat (limited to 'apps/files_encryption/tests/util.php')
-rwxr-xr-xapps/files_encryption/tests/util.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index cf2aa5f516f..079dafd09ff 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -164,8 +164,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->assertTrue($util->isEncryptedPath($this->userId . '/files/' . $encryptedFile));
// cleanup
- $this->view->unlink($this->userId . '/files/' . $unencryptedFile, $this->dataShort);
- $this->view->unlink($this->userId . '/files/' . $encryptedFile, $this->dataShort);
+ $this->view->unlink($this->userId . '/files/' . $unencryptedFile);
+ $this->view->unlink($this->userId . '/files/' . $encryptedFile);
}
@@ -341,8 +341,6 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
$userdir = $datadir . '/' . $this->userId . '/files/';
- $util = new Encryption\Util($this->view, $this->userId);
-
$this->view->file_put_contents($this->userId . '/files/' . $filename, $this->dataShort);
$fileInfoEncrypted = $this->view->getFileInfo($this->userId . '/files/' . $filename);
@@ -438,7 +436,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->userId . '/files_encryption/keyfiles/' . $file1 . '.key.moved');
// decrypt all encrypted files
- $result = $util->decryptAll('/' . $this->userId . '/' . 'files');
+ $result = $util->decryptAll();
$this->assertFalse($result);
@@ -461,7 +459,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
$this->userId . '/files_encryption/keyfiles/' . $file1 . '.key');
// try again to decrypt all encrypted files
- $result = $util->decryptAll('/' . $this->userId . '/' . 'files');
+ $result = $util->decryptAll();
$this->assertTrue($result);