Adding support of -1 as size to be passed into get and getFile

1 files changed, 17 insertions, 4 deletions

diff --git a/tests/lib/avatartest.php b/tests/lib/avatartest.php
index d3e615977cb..fe6d3e2fa3f 100644
--- a/tests/lib/avatartest.php
+++ b/tests/lib/avatartest.php
@@ -7,14 +7,13 @@
  * See the COPYING-README file.
  */
 
-use OC\Avatar;
 use OCP\Files\Folder;
 
 class AvatarTest extends \Test\TestCase {
-	/** @var  Folder */
+	/** @var Folder | PHPUnit_Framework_MockObject_MockObject */
 	private $folder;
 
-	/** @var  \OC\Avatar */
+	/** @var \OC\Avatar */
 	private $avatar;
 
 	public function setUp() {
@@ -24,7 +23,6 @@ class AvatarTest extends \Test\TestCase {
 		$l = $this->getMock('\OCP\IL10N');
 		$l->method('t')->will($this->returnArgument(0));
 		$this->avatar = new \OC\Avatar($this->folder, $l);
-
 	}
 
 	public function testGetNoAvatar() {
@@ -47,6 +45,21 @@ class AvatarTest extends \Test\TestCase {
 		$this->assertEquals($expected->data(), $this->avatar->get(128)->data());
 	}
 
+	public function testGetAvatarSizeMinusOne() {
+		$this->folder->method('nodeExists')
+			->will($this->returnValueMap([
+				['avatar.jpg', true],
+			]));
+
+		$expected = new OC_Image(\OC::$SERVERROOT . '/tests/data/testavatar.png');
+
+		$file = $this->getMock('\OCP\Files\File');
+		$file->method('getContent')->willReturn($expected->data());
+		$this->folder->method('get')->with('avatar.jpg')->willReturn($file);
+
+		$this->assertEquals($expected->data(), $this->avatar->get(-1)->data());
+	}
+
 	public function testGetAvatarNoSizeMatch() {
 		$this->folder->method('nodeExists')
 			->will($this->returnValueMap([