improved tests

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e3196480457845d15dca145819af635d3b9682cf..53afefc721b7e2bc7e9887bfd7aa3a7d4d238e5f 100644 (file)
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -225,15 +225,20 @@ class Hooks {
                                break;\r
                }\r
 \r
+               $error = false;\r
                foreach ($users as $user) {\r
                        if (!$view->file_exists($user . '.public.key')) {\r
-                               // Set flag var 'run' to notify emitting\r
-                               // script that hook execution failed\r
-                               $params['run']->run = false;\r
-                               // TODO: Make sure files_sharing provides user\r
-                               // feedback on failed share\r
+                               $error = true;\r
+                               break;\r
                        }\r
                }\r
+\r
+               if($error)\r
+                       // Set flag var 'run' to notify emitting\r
+                       // script that hook execution failed\r
+                       $params['run']->run = false;\r
+                       // TODO: Make sure files_sharing provides user\r
+                       // feedback on failed share\r
        }\r
 \r
        /**\r

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 6a1f1aef659457b3d4cf54c9f23e4f2ea862d078..049f3fb5d983b48cecf66ba2392c58b6a9e8717d 100755 (executable)
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -706,41 +706,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
                $this->assertEquals($this->dataLong, $decrypt);
 
-               $newFolder = '/newfolder' . time();
-
-               $view->rename($folder, $newFolder);
-
-               // Get file decrypted contents
-               $newDecrypt = file_get_contents('crypt://' . $newFolder . $filename);
-
-               $this->assertEquals($this->dataLong, $newDecrypt);
-
-               // tear down
-               $view->unlink($newFolder);
-       }
-
-       function testRenameFolder()
-       {
-
-               $filename = '/tmp-' . time();
+               $newFolder = '/newfolder/subfolder' . time();
+               $view->mkdir('/newfolder');
 
-               $folder = '/folder';
-               $newFolder = '/newfolder';
-               $view = new \OC\Files\View('/' . $this->userId . '/files');
-               $view->mkdir($folder);
-
-               // Save long data as encrypted file using stream wrapper
-               $cryptedFile = file_put_contents('crypt://' . $folder . $filename, $this->dataLong);
-
-               // Test that data was successfully written
-               $this->assertTrue(is_int($cryptedFile));
-
-               // Get file decrypted contents
-               $decrypt = file_get_contents('crypt://' . $folder . $filename);
-
-               $this->assertEquals($this->dataLong, $decrypt);
-
-               // rename folder
                $view->rename($folder, $newFolder);
 
                // Get file decrypted contents
@@ -754,8 +722,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase
 
        function testChangePassphrase()
        {
-
-               $filename = 'tmp-' . time();
+       $filename = 'tmp-' . time();
 
                // Save long data as encrypted file using stream wrapper
                $cryptedFile = file_put_contents('crypt://' . $filename, $this->dataLong);