Fixed caldav tests and metadata 2

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php

@@ -29,6 +29,7 @@ use OCP\Activity\IProvider;
 use OCP\IL10N;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\IGroupManager;
 use Test\TestCase;
 
 class BaseTest extends TestCase {
@@ -36,15 +37,20 @@ class BaseTest extends TestCase {
 	/** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $userManager;
 
+	/** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $groupManager;
+
 	/** @var IProvider|Base|\PHPUnit_Framework_MockObject_MockObject */
 	protected $provider;
 
 	protected function setUp() {
 		parent::setUp();
 		$this->userManager = $this->createMock(IUserManager::class);
+		$this->groupManager = $this->createMock(IGroupManager::class);
 		$this->provider = $this->getMockBuilder(Base::class)
 			->setConstructorArgs([
-				$this->userManager
+				$this->userManager,
+				$this->groupManager
 			])
 			->setMethods(['parse'])
 			->getMock();

tests/lib/Group/MetaDataTest.php

@@ -56,9 +56,9 @@ class MetaDataTest extends \Test\TestCase {
 		$group->expects($this->exactly(6))
 			->method('getGID')
 			->will($this->onConsecutiveCalls(
-				'admin', 'admin', 'admin',
+				'admin', 'admin',
-				'g2', 'g2', 'g2',
+				'g2', 'g2',
-				'g3', 'g3', 'g3'));
+				'g3', 'g3'));
 
 		$group->expects($this->exactly(3))
 			->method('getDisplayName')