summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-01-02 16:08:08 +0100
committerRobin Appelman <icewind@owncloud.com>2014-01-02 16:08:08 +0100
commit6f6c3d1e44ea582626f8c902e05af9601e220bcf (patch)
treef83beafed35491269e89f139df3e060718bccc27
parent14e0b1b6d1b64c2e37bbba0731a8f7b9a338ebb0 (diff)
downloadnextcloud-server-6f6c3d1e44ea582626f8c902e05af9601e220bcf.tar.gz
nextcloud-server-6f6c3d1e44ea582626f8c902e05af9601e220bcf.zip
Make OC_Avatar unit tests independent of currently loggedin user
-rw-r--r--tests/lib/avatar.php18
1 files changed, 13 insertions, 5 deletions
diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
index 9cc14865a29..0334639afa8 100644
--- a/tests/lib/avatar.php
+++ b/tests/lib/avatar.php
@@ -1,20 +1,28 @@
<?php
+
/**
* Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
-
class Test_Avatar extends PHPUnit_Framework_TestCase {
+ private $user;
+
+ public function setUp() {
+ $this->user = uniqid();
+ $storage = new \OC\Files\Storage\Temporary(array());
+ \OC\Files\Filesystem::mount($storage, array(), '/' . $this->user . '/');
+ }
+
public function testAvatar() {
- $avatar = new \OC_Avatar(\OC_User::getUser());
+ $avatar = new \OC_Avatar($this->user);
$this->assertEquals(false, $avatar->get());
- $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
+ $expected = new OC_Image(\OC::$SERVERROOT . '/tests/data/testavatar.png');
$expected->resize(64);
$avatar->set($expected->data());
$this->assertEquals($expected->data(), $avatar->get()->data());
@@ -25,11 +33,11 @@ class Test_Avatar extends PHPUnit_Framework_TestCase {
public function testAvatarApi() {
$avatarManager = \OC::$server->getAvatarManager();
- $avatar = $avatarManager->getAvatar(\OC_User::getUser());
+ $avatar = $avatarManager->getAvatar($this->user);
$this->assertEquals(false, $avatar->get());
- $expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
+ $expected = new OC_Image(\OC::$SERVERROOT . '/tests/data/testavatar.png');
$expected->resize(64);
$avatar->set($expected->data());
$this->assertEquals($expected->data(), $avatar->get()->data());