fixed tests after merge against master

4 files changed, 19 insertions, 8 deletions

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 7f9572f4266..4a85048ba43 100755
--- 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 81034be54b1..33ca29997be 100644
--- 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 ba82ac80eab..633cc9e4fce 100644
--- 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 0659b468a37..e3ec0860fa5 100755
--- 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() {