From 0e58800016419daf3b2d032136415a5fe9d6331f Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Wed, 29 Aug 2012 08:42:49 +0200 Subject: Whitespace fixes in apps --- apps/files_encryption/tests/encryption.php | 4 ++-- apps/files_encryption/tests/proxy.php | 12 ++++++------ apps/files_encryption/tests/stream.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'apps/files_encryption/tests') diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php index 286770a69f5..f70411ed63c 100644 --- a/apps/files_encryption/tests/encryption.php +++ b/apps/files_encryption/tests/encryption.php @@ -23,7 +23,7 @@ class Test_Encryption extends UnitTestCase { $decrypted=OC_Crypt::decrypt($encrypted,$key); $decrypted=rtrim($decrypted, "\0"); $this->assertEqual($decrypted,$chunk); - + $encrypted=OC_Crypt::blockEncrypt($source,$key); $decrypted=OC_Crypt::blockDecrypt($encrypted,$key); $this->assertNotEqual($encrypted,$source); @@ -56,7 +56,7 @@ class Test_Encryption extends UnitTestCase { function testBinary(){ $key=uniqid(); - + $file=__DIR__.'/binary'; $source=file_get_contents($file); //binary file $encrypted=OC_Crypt::encrypt($source,$key); diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index 5463836a209..c4952d13d39 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -9,18 +9,18 @@ class Test_CryptProxy extends UnitTestCase { private $oldConfig; private $oldKey; - + public function setUp(){ $user=OC_User::getUser(); $this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true'); OCP\Config::setAppValue('files_encryption','enable_encryption','true'); $this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null; - - + + //set testing key $_SESSION['enckey']=md5(time()); - + //clear all proxies and hooks so we can do clean testing OC_FileProxy::clearProxies(); OC_Hook::clear('OC_Filesystem'); @@ -52,11 +52,11 @@ class Test_CryptProxy extends UnitTestCase { $original=file_get_contents($file); OC_Filesystem::file_put_contents('/file',$original); - + OC_FileProxy::$enabled=false; $stored=OC_Filesystem::file_get_contents('/file'); OC_FileProxy::$enabled=true; - + $fromFile=OC_Filesystem::file_get_contents('/file'); $this->assertNotEqual($original,$stored); $this->assertEqual(strlen($original),strlen($fromFile)); diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index d95ea792f72..517d497344e 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -8,7 +8,7 @@ class Test_CryptStream extends UnitTestCase { private $tmpFiles=array(); - + function testStream(){ $stream=$this->getStream('test1','w',strlen('foobar')); fwrite($stream,'foobar'); -- cgit v1.2.3