Fix spacing, have remove() and return JSON for custom-default-avatars

1 files changed, 3 insertions, 11 deletions

diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
index 42b06f8bccb..adb6a5102b1 100644
--- a/tests/lib/avatar.php
+++ b/tests/lib/avatar.php
@@ -9,22 +9,14 @@
 class Test_Avatar extends PHPUnit_Framework_TestCase {
 
 	public function testAvatar() {
-		$expected = \OC_Avatar::getDefaultAvatar()->data();
-		$this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data());
+		$this->assertEquals(false, \OC_Avatar::get(\OC_User::getUser())->data());
 
 		$expected = new OC_Image(\OC::$SERVERROOT.'/tests/data/testavatar.png');
 		\OC_Avatar::set(\OC_User::getUser(), $expected->data());
 		$expected->resize(64);
 		$this->assertEquals($expected->data(), \OC_Avatar::get(\OC_User::getUser())->data());
 
-		\OC_Avatar::set(\OC_User::getUser(), false);
-		$expected = \OC_Avatar::getDefaultAvatar()->data();
-		$this->assertEquals($expected, \OC_Avatar::get(\OC_User::getUser())->data());
+		\OC_Avatar::remove(\OC_User::getUser());
+		$this->assertEquals(false, \OC_Avatar::get(\OC_User::getUser())->data());
 	}
-
-	/*public function testDefaultAvatar() {
-		$img = new \OC_Image(OC::$SERVERROOT.'/core/img/defaultavatar.png');
-		$img->resize(128);
-		$this->assertEquals($img->data(), \OC_Avatar::getDefaultAvatar(\OC_User::getUser(), 128)->data());
-	}*/
 }