call set password hook because it doesn't get triggered during test execution and...

diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 1d852d3c8cc0d3c35d198921533133f1750cd660..e55427620a6e55ca7cef0d4baa8a4e3f8eb9e39f 100755 (executable)
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -756,7 +756,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
                // login as admin
                \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
-               \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+               $result = \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
+               $this->assertTrue($result);
+
                $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
                // login as user2
@@ -767,6 +769,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
                // enable recovery for admin
                $this->assertTrue($util->setRecoveryForUser(1));
 
+               // add recovery keys for existing files (e.g. the auto-generated welcome.txt)
+               $util->addRecoveryKeys();
+
                // create folder structure
                $this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
                $this->view->mkdir(
@@ -805,6 +810,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
                // change password
                \OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
+               $params = array('uid' => \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2,
+                       'password' => 'test',
+                       'recoveryPassword' => 'test123');
+               \OCA\Encryption\Hooks::setPassphrase($params);
 
                // login as user2
                \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
@@ -819,8 +828,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
                $this->assertEquals($this->dataShort, $retrievedCryptedFile2);
 
                // cleanup
-               $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->folder1);
-               $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files' . $this->filename);
+               $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->folder1);
+               $this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->filename);
 
                // check if share key for user and recovery exists
                $this->assertFalse($this->view->file_exists(