aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-03-05 10:10:05 +0100
committerJoas Schilling <coding@schilljs.com>2018-03-12 12:02:14 +0100
commitae369e870dea914c1d2d4cfac6d29dc4f51c4709 (patch)
treee356fc111c883d2a7e3e5ff4c635ed3028179ac9
parent2609b30df0694f7d03e886c1782df54d4c9b01ac (diff)
downloadnextcloud-server-ae369e870dea914c1d2d4cfac6d29dc4f51c4709.tar.gz
nextcloud-server-ae369e870dea914c1d2d4cfac6d29dc4f51c4709.zip
Fixed caldav tests and metadata 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php8
-rw-r--r--tests/lib/Group/MetaDataTest.php6
2 files changed, 10 insertions, 4 deletions
diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
index affc1909e3f..37a56f88042 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
+++ b/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();
diff --git a/tests/lib/Group/MetaDataTest.php b/tests/lib/Group/MetaDataTest.php
index 04d2ff807b4..02c881b2e25 100644
--- a/tests/lib/Group/MetaDataTest.php
+++ b/tests/lib/Group/MetaDataTest.php
@@ -56,9 +56,9 @@ class MetaDataTest extends \Test\TestCase {
$group->expects($this->exactly(9))
->method('getGID')
->will($this->onConsecutiveCalls(
- 'admin', 'admin', 'admin',
- 'g2', 'g2', 'g2',
- 'g3', 'g3', 'g3'));
+ 'admin', 'admin',
+ 'g2', 'g2',
+ 'g3', 'g3'));
$group->expects($this->exactly($countCallCount))
->method('count')