From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 18 Oct 2016 21:01:44 +0000 (+0200)
Subject: Fix tests
X-Git-Tag: v11.0RC2~277^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9fa3a22ddd7703302c4d8c452b8d2a6b5a401287;p=nextcloud-server.git

Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index 5f77c0f44f6..c650f6c30be 100644
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -225,7 +225,6 @@ class AddressBookImpl implements IAddressBook {
 		];
 
 		foreach ($vCard->children() as $property) {
-			$result[$property->name] = $property->getValue();
 			if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
 				$url = $this->urlGenerator->getAbsoluteURL(
 					$this->urlGenerator->linkTo('', 'remote.php') . '/dav/');
diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
index bd63f4cdffb..172b341bd79 100644
--- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
+++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -332,10 +332,11 @@ class AddressBookImplTest extends TestCase {
 
 		$array = $this->invokePrivate($this->addressBookImpl, 'vCard2Array', ['uri', $vCard]);
 		unset($array['PRODID']);
+		unset($array['UID']);
 
 		$this->assertEquals([
 			'URI' => 'uri',
-			'VERSION' => '3.0',
+			'VERSION' => '4.0',
 			'FN' => 'Full Name',
 			'CLOUD' => [
 				'cloud-user1@localhost',