Fix update of avatar image

1 files changed, 28 insertions, 29 deletions

diff --git a/apps/dav/tests/unit/carddav/convertertest.php b/apps/dav/tests/unit/carddav/convertertest.php
index b4a0ee2a664..f4e2ea3f002 100644
--- a/apps/dav/tests/unit/carddav/convertertest.php
+++ b/apps/dav/tests/unit/carddav/convertertest.php
@@ -30,11 +30,7 @@ class ConverterTests extends  TestCase {
 	 * @dataProvider providesNewUsers
 	 */
 	public function testCreation($expectedVCard, $displayName = null, $eMailAddress = null, $cloudId = null) {
-		$user = $this->getMockBuilder('OCP\IUser')->disableOriginalConstructor()->getMock();
-		$user->method('getUID')->willReturn('12345');
-		$user->method('getDisplayName')->willReturn($displayName);
-		$user->method('getEMailAddress')->willReturn($eMailAddress);
-		$user->method('getCloudId')->willReturn($cloudId);
+		$user = $this->getUserMock($displayName, $eMailAddress, $cloudId);
 
 		$converter = new Converter();
 		$vCard = $converter->createCardFromUser($user);
@@ -45,22 +41,18 @@ class ConverterTests extends  TestCase {
 
 	public function providesNewUsers() {
 		return [
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nEND:VCARD\r\n"],
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nEND:VCARD\r\n", "Dr. Foo Bar"],
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nEMAIL;TYPE=OTHER:foo@bar.net\r\nEND:VCARD\r\n", "Dr. Foo Bar", "foo@bar.net"],
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nCLOUD:foo@bar.net\r\nEND:VCARD\r\n", "Dr. Foo Bar", null, "foo@bar.net"],
+				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nPHOTO;ENCODING=b;TYPE=JPEG:MTIzNDU2Nzg5\r\nEND:VCARD\r\n"],
+				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nPHOTO;ENCODING=b;TYPE=JPEG:MTIzNDU2Nzg5\r\nEND:VCARD\r\n", "Dr. Foo Bar"],
+				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nEMAIL;TYPE=OTHER:foo@bar.net\r\nPHOTO;ENCODING=b;TYPE=JPEG:MTIzNDU2Nzg5\r\nEND:VCARD\r\n", "Dr. Foo Bar", "foo@bar.net"],
+				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nCLOUD:foo@bar.net\r\nPHOTO;ENCODING=b;TYPE=JPEG:MTIzNDU2Nzg5\r\nEND:VCARD\r\n", "Dr. Foo Bar", null, "foo@bar.net"],
 		];
 	}
 
 	/**
-	 * @dataProvider providesUsersForUpdate
+	 * @dataProvider providesNewUsers
 	 */
 	public function testUpdateOfUnchangedUser($expectedVCard, $displayName = null, $eMailAddress = null, $cloudId = null) {
-		$user = $this->getMockBuilder('OCP\IUser')->disableOriginalConstructor()->getMock();
-		$user->method('getUID')->willReturn('12345');
-		$user->method('getDisplayName')->willReturn($displayName);
-		$user->method('getEMailAddress')->willReturn($eMailAddress);
-		$user->method('getCloudId')->willReturn($cloudId);
+		$user = $this->getUserMock($displayName, $eMailAddress, $cloudId);
 
 		$converter = new Converter();
 		$vCard = $converter->createCardFromUser($user);
@@ -71,24 +63,11 @@ class ConverterTests extends  TestCase {
 		$this->assertEquals($expectedVCard, $cardData);
 	}
 
-	public function providesUsersForUpdate() {
-		return [
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:12345\r\nN:12345;;;;\r\nEND:VCARD\r\n"],
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nEND:VCARD\r\n", "Dr. Foo Bar"],
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nEMAIL;TYPE=OTHER:foo@bar.net\r\nEND:VCARD\r\n", "Dr. Foo Bar", "foo@bar.net"],
-				["BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.7//EN\r\nUID:12345\r\nFN:Dr. Foo Bar\r\nN:Bar;Dr.;Foo;;\r\nCLOUD:foo@bar.net\r\nEND:VCARD\r\n", "Dr. Foo Bar", null, "foo@bar.net"],
-		];
-	}
-
 	/**
 	 * @dataProvider providesUsersForUpdateOfRemovedElement
 	 */
 	public function testUpdateOfRemovedElement($expectedVCard, $displayName = null, $eMailAddress = null, $cloudId = null) {
-		$user = $this->getMockBuilder('OCP\IUser')->disableOriginalConstructor()->getMock();
-		$user->method('getUID')->willReturn('12345');
-		$user->method('getDisplayName')->willReturn($displayName);
-		$user->method('getEMailAddress')->willReturn($eMailAddress);
-		$user->method('getCloudId')->willReturn($cloudId);
+		$user = $this->getUserMock($displayName, $eMailAddress, $cloudId);
 
 		$converter = new Converter();
 		$vCard = $converter->createCardFromUser($user);
@@ -98,6 +77,7 @@ class ConverterTests extends  TestCase {
 		$user1->method('getDisplayName')->willReturn(null);
 		$user1->method('getEMailAddress')->willReturn(null);
 		$user1->method('getCloudId')->willReturn(null);
+		$user1->method('getAvatarImage')->willReturn(null);
 
 		$updated = $converter->updateCard($vCard, $user1);
 		$this->assertTrue($updated);
@@ -134,4 +114,23 @@ class ConverterTests extends  TestCase {
 				['Tolkien;John;Ronald Reuel;;', 'John Ronald Reuel Tolkien'],
 		];
 	}
+
+	/**
+	 * @param $displayName
+	 * @param $eMailAddress
+	 * @param $cloudId
+	 * @return \PHPUnit_Framework_MockObject_MockObject
+	 */
+	protected function getUserMock($displayName, $eMailAddress, $cloudId) {
+		$image0 = $this->getMockBuilder('OCP\IImage')->disableOriginalConstructor()->getMock();
+		$image0->method('mimeType')->willReturn('JPEG');
+		$image0->method('data')->willReturn('123456789');
+		$user = $this->getMockBuilder('OCP\IUser')->disableOriginalConstructor()->getMock();
+		$user->method('getUID')->willReturn('12345');
+		$user->method('getDisplayName')->willReturn($displayName);
+		$user->method('getEMailAddress')->willReturn($eMailAddress);
+		$user->method('getCloudId')->willReturn($cloudId);
+		$user->method('getAvatarImage')->willReturn($image0);
+		return $user;
+	}
 }