From 54238941754ed4c0bad9e3e252d7784370460f30 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Thu, 23 May 2019 17:16:42 +0200
Subject: [PATCH] Revert "Do not use getDisplayName for groups"

This reverts commit 12ebffb88572f0b75ae1e8538fb29af78058c28a.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
 lib/Db/Group.php            |  2 +-
 tests/unit/Db/GroupTest.php | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/Db/Group.php b/lib/Db/Group.php
index 4b23fae19..f668282b7 100644
--- a/lib/Db/Group.php
+++ b/lib/Db/Group.php
@@ -35,7 +35,7 @@ class Group extends RelationalObject {
 	public function getObjectSerialization() {
 		return [
 			'uid' => $this->object->getGID(),
-			'displayname' => $this->object->getGID()
+			'displayname' => $this->object->getDisplayName()
 		];
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/Db/GroupTest.php b/tests/unit/Db/GroupTest.php
index cb98d6f0f..8f0678c62 100644
--- a/tests/unit/Db/GroupTest.php
+++ b/tests/unit/Db/GroupTest.php
@@ -33,10 +33,13 @@ class GroupTest extends \Test\TestCase {
 		$group->expects($this->any())
 			->method('getGID')
 			->willReturn('mygroup');
+		$group->expects($this->any())
+			->method('getDisplayName')
+			->willReturn('My Group');
 		$groupRelationalObject = new Group($group);
 		$expected = [
 			'uid' => 'mygroup',
-			'displayname' => 'mygroup'
+			'displayname' => 'My Group'
 		];
 		$this->assertEquals($expected, $groupRelationalObject->getObjectSerialization());
 	}
@@ -47,12 +50,19 @@ class GroupTest extends \Test\TestCase {
 		$group->expects($this->any())
 			->method('getGID')
 			->willReturn('mygroup');
+		$group->expects($this->any())
+			->method('getDisplayName')
+			->willReturn('My Group');
 		$groupRelationalObject = new Group($group);
 		$expected = [
 			'uid' => 'mygroup',
-			'displayname' => 'mygroup',
+			'displayname' => 'My Group',
 			'primaryKey' => 'mygroup'
 		];
-		$this->assertEquals($expected, $groupRelationalObject->jsonSerialize());
+
+		$actual = $groupRelationalObject->jsonSerialize();
+		asort($expected);
+		asort($actual);
+		$this->assertEquals($expected, $actual);
 	}
-}
\ No newline at end of file
+}