fixed tests after merge against master

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 7f9572f4266a6c293b4053f1cbebb8fa3c5e3259..4a85048ba433e8d7470ab1b450f06b3a5d33d60b 100755 (executable)
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -21,7 +21,6 @@ use OCA\Encryption;
 
 // This has to go here because otherwise session errors arise, and the private 
 // encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
 
 /**
  * @note It would be better to use Mockery here for mocking out the session 
@@ -37,7 +36,7 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
         // reset backend
         \OC_User::useBackend('database');
 
-               // set content for encrypting / decrypting in tests
+        // set content for encrypting / decrypting in tests
                $this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
                $this->dataShort = 'hats';
                $this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
@@ -60,13 +59,17 @@ class Test_Crypt extends \PHPUnit_Framework_TestCase {
 
         \OC\Files\Filesystem::init($this->userId, '/');
         \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
+
+        $params['uid'] = $this->userId;
+        $params['password'] = $this->pass;
+        OCA\Encryption\Hooks::login($params);
        }
        
        function tearDown() {
 
        }
 
-       function testGenerateKey() {
+    function testGenerateKey() {
        
                # TODO: use more accurate (larger) string length for test confirmation
                

diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 81034be54b1711873afd3681bd005ff2e9936030..33ca29997be4b867971da2a75a940edcf8b4cf80 100644 (file)
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -19,7 +19,7 @@ use OCA\Encryption;
 
 // This has to go here because otherwise session errors arise, and the private 
 // encryption key needs to be saved in the session
-\OC_User::login( 'admin', 'admin' );
+//\OC_User::login( 'admin', 'admin' );
 
 class Test_Keymanager extends \PHPUnit_Framework_TestCase {
        
@@ -52,7 +52,10 @@ class Test_Keymanager extends \PHPUnit_Framework_TestCase {
 
         \OC\Files\Filesystem::init( $this->userId, '/' );
         \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
-       
+
+        $params['uid'] = $this->userId;
+        $params['password'] = $this->pass;
+        OCA\Encryption\Hooks::login($params);
        }
        
        function tearDown(){

diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index ba82ac80eabb17dc16d01dce0d61d0f042c8a1b0..633cc9e4fce726d7f65a851b1b3fbce1378ba3b0 100644 (file)
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -1,4 +1,4 @@
-// <?php
+<?php
 // /**
 //  * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
 //  * This file is licensed under the Affero General Public License version 3 or

diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 0659b468a37d8c32ce7e8bd544ce71318424990a..e3ec0860fa5abe289a33eb504221ead1579a0d9f 100755 (executable)
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -24,8 +24,6 @@ $loader->register();
 use \Mockery as m;
 use OCA\Encryption;
 
-\OC_User::login( 'admin', 'admin' );
-
 class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
        
        function setUp() {
@@ -62,6 +60,10 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
         \OC\Files\Filesystem::init( $this->userId, '/' );
         \OC\Files\Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => $this->dataDir), '/' );
 
+        $params['uid'] = $this->userId;
+        $params['password'] = $this->pass;
+        OCA\Encryption\Hooks::login($params);
+
                $mockView = m::mock('OC_FilesystemView');
                $this->util = new Encryption\Util( $mockView, $this->userId );
        
@@ -75,6 +77,9 @@ class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
        
        /**
         * @brief test that paths set during User construction are correct
+     *
+     *
+     *
         */
        function testKeyPaths() {