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

adapt tests to the new code

This commit is contained in:
Bjoern Schiessle 2013-11-20 23:27:42 +01:00
parent b9c18d16fe
commit 318db64b2d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/files_encryption/tests/crypt.php
View File

@ -157,6 +157,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$filename = 'tmp-' . time() . '.test'; $filename = 'tmp-' . time() . '.test';
$util = new Encryption\Util(new \OC_FilesystemView(), $this->userId);
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort); $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
// Test that data was successfully written // Test that data was successfully written
@ -176,10 +178,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$this->assertNotEquals($this->dataShort, $retreivedCryptedFile); $this->assertNotEquals($this->dataShort, $retreivedCryptedFile);
// Get the encrypted keyfile // Get the encrypted keyfile
$encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename); $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $util, $filename);
// Attempt to fetch the user's shareKey // Attempt to fetch the user's shareKey
$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename); $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $util, $filename);
// get session // get session
$session = new \OCA\Encryption\Session($this->view); $session = new \OCA\Encryption\Session($this->view);
@ -214,6 +216,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// Generate a a random filename // Generate a a random filename
$filename = 'tmp-' . time() . '.test'; $filename = 'tmp-' . time() . '.test';
$util = new Encryption\Util(new \OC_FilesystemView(), $this->userId);
// Save long data as encrypted file using stream wrapper // Save long data as encrypted file using stream wrapper
$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong); $cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
@ -244,16 +248,16 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$i = 0; $i = 0;
while ($i < count($r)-1) { while ($i < count($r)-1) {
$e[] = $r[$i] . $r[$i+1]; $e[] = $r[$i] . $r[$i+1];
$i = $i + 2; $i = $i + 2;
} }
//print_r($e); //print_r($e);
// Get the encrypted keyfile // Get the encrypted keyfile
$encKeyfile = Encryption\Keymanager::getFileKey($this->view, $this->userId, $filename); $encKeyfile = Encryption\Keymanager::getFileKey($this->view, $util, $filename);
// Attempt to fetch the user's shareKey // Attempt to fetch the user's shareKey
$shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename); $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $util, $filename);
// get session // get session
$session = new \OCA\Encryption\Session($this->view); $session = new \OCA\Encryption\Session($this->view);
@ -387,7 +391,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
* @brief test decryption using legacy blowfish method * @brief test decryption using legacy blowfish method
*/ */
function testLegacyDecryptShort() { function testLegacyDecryptShort() {
$crypted = $this->legacyEncrypt($this->dataShort, $this->pass); $crypted = $this->legacyEncrypt($this->dataShort, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass); $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
@ -401,7 +405,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
* @brief test decryption using legacy blowfish method * @brief test decryption using legacy blowfish method
*/ */
function testLegacyDecryptLong() { function testLegacyDecryptLong() {
$crypted = $this->legacyEncrypt($this->dataLong, $this->pass); $crypted = $this->legacyEncrypt($this->dataLong, $this->pass);
$decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass); $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
@ -653,8 +657,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
// tear down // tear down
$view->unlink($filename); $view->unlink($filename);
} }
/** /**
* @brief encryption using legacy blowfish method * @brief encryption using legacy blowfish method
* @param $data string data to encrypt * @param $data string data to encrypt