adapt tests to the new code
This commit is contained in:
parent
b9c18d16fe
commit
318db64b2d
|
@ -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);
|
||||||
|
|
||||||
|
@ -250,10 +254,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
|
||||||
//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);
|
||||||
|
|
Loading…
Reference in New Issue