Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-04-30 10:10:56 +0300
committerGitHub <noreply@github.com>2020-04-30 10:10:56 +0300
commita1f3293c06648f6b3c36353edb4a04794fabbba9 (patch)
tree4fef57e3ba9a76f35219302704b6881b43a9b67b /apps/dav/tests
parenta1c1b354fcb79153a78a658b758acd514089c9e1 (diff)
parentdeb2ea9cead3dbf428877faed5136fe73198b6c7 (diff)
Merge pull request #19039 from nextcloud/dav-activity-provide-links-to-calendar
Provide links to calendar in event creation/update activities
Diffstat (limited to 'apps/dav/tests')
-rw-r--r--apps/dav/tests/unit/CalDAV/Activity/BackendTest.php22
-rw-r--r--apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php64
-rw-r--r--apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php164
3 files changed, 196 insertions, 54 deletions
diff --git a/apps/dav/tests/unit/CalDAV/Activity/BackendTest.php b/apps/dav/tests/unit/CalDAV/Activity/BackendTest.php
index 3012423bb19..43d8416fce1 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/BackendTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/BackendTest.php
@@ -30,40 +30,47 @@ use OCA\DAV\CalDAV\Activity\Backend;
use OCA\DAV\CalDAV\Activity\Provider\Calendar;
use OCP\Activity\IEvent;
use OCP\Activity\IManager;
+use OCP\App\IAppManager;
use OCP\IGroup;
use OCP\IGroupManager;
use OCP\IUser;
use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class BackendTest extends TestCase {
- /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|MockObject */
protected $activityManager;
- /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IGroupManager|MockObject */
protected $groupManager;
- /** @var IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserSession|MockObject */
protected $userSession;
+ /** @var IAppManager|MockObject */
+ protected $appManager;
+
protected function setUp(): void {
parent::setUp();
$this->activityManager = $this->createMock(IManager::class);
$this->groupManager = $this->createMock(IGroupManager::class);
$this->userSession = $this->createMock(IUserSession::class);
+ $this->appManager = $this->createMock(IAppManager::class);
}
/**
* @param array $methods
- * @return Backend|\PHPUnit_Framework_MockObject_MockObject
+ * @return Backend|MockObject
*/
protected function getBackend(array $methods = []) {
if (empty($methods)) {
return new Backend(
$this->activityManager,
$this->groupManager,
- $this->userSession
+ $this->userSession,
+ $this->appManager
);
} else {
return $this->getMockBuilder(Backend::class)
@@ -71,6 +78,7 @@ class BackendTest extends TestCase {
$this->activityManager,
$this->groupManager,
$this->userSession,
+ $this->appManager,
])
->setMethods($methods)
->getMock();
@@ -340,7 +348,7 @@ class BackendTest extends TestCase {
/**
* @param string[] $users
- * @return IUser[]|\PHPUnit_Framework_MockObject_MockObject[]
+ * @return IUser[]|MockObject[]
*/
protected function getUsers(array $users) {
$list = [];
@@ -352,7 +360,7 @@ class BackendTest extends TestCase {
/**
* @param string $uid
- * @return IUser|\PHPUnit_Framework_MockObject_MockObject
+ * @return IUser|MockObject
*/
protected function getUserMock($uid) {
$user = $this->createMock(IUser::class);
diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
index d692878cc13..423c37da3e0 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php
@@ -6,6 +6,7 @@
* @author Joas Schilling <coding@schilljs.com>
* @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Citharel <nextcloud@tcit.fr>
*
* @license GNU AGPL version 3 or any later version
*
@@ -31,29 +32,36 @@ use OCP\Activity\IEvent;
use OCP\Activity\IProvider;
use OCP\IGroupManager;
use OCP\IL10N;
+use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
+use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase;
class BaseTest extends TestCase {
- /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IUserManager|MockObject */
protected $userManager;
- /** @var IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IGroupManager|MockObject */
protected $groupManager;
- /** @var IProvider|Base|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IURLGenerator|MockObject */
+ protected $url;
+
+ /** @var IProvider|Base|MockObject */
protected $provider;
protected function setUp(): void {
parent::setUp();
$this->userManager = $this->createMock(IUserManager::class);
$this->groupManager = $this->createMock(IGroupManager::class);
+ $this->url = $this->createMock(IURLGenerator::class);
$this->provider = $this->getMockBuilder(Base::class)
->setConstructorArgs([
$this->userManager,
- $this->groupManager
+ $this->groupManager,
+ $this->url,
])
->setMethods(['parse'])
->getMock();
@@ -72,7 +80,7 @@ class BaseTest extends TestCase {
* @param array $parameters
* @param string $parsedSubject
*/
- public function testSetSubjects($subject, array $parameters, $parsedSubject) {
+ public function testSetSubjects(string $subject, array $parameters, string $parsedSubject) {
$event = $this->createMock(IEvent::class);
$event->expects($this->once())
->method('setRichSubject')
@@ -86,44 +94,6 @@ class BaseTest extends TestCase {
$this->invokePrivate($this->provider, 'setSubjects', [$event, $subject, $parameters]);
}
- public function dataGenerateObjectParameter() {
- return [
- [23, 'c1'],
- [42, 'c2'],
- ];
- }
-
- /**
- * @dataProvider dataGenerateObjectParameter
- * @param int $id
- * @param string $name
- */
- public function testGenerateObjectParameter($id, $name) {
- $this->assertEquals([
- 'type' => 'calendar-event',
- 'id' => $id,
- 'name' => $name,
- ], $this->invokePrivate($this->provider, 'generateObjectParameter', [['id' => $id, 'name' => $name]]));
- }
-
- public function dataGenerateObjectParameterThrows() {
- return [
- ['event'],
- [['name' => 'event']],
- [['id' => 42]],
- ];
- }
-
- /**
- * @dataProvider dataGenerateObjectParameterThrows
- * @param mixed $eventData
- */
- public function testGenerateObjectParameterThrows($eventData) {
- $this->expectException(\InvalidArgumentException::class);
-
- $this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData]);
- }
-
public function dataGenerateCalendarParameter() {
return [
[['id' => 23, 'uri' => 'foo', 'name' => 'bar'], 'bar'],
@@ -138,7 +108,7 @@ class BaseTest extends TestCase {
* @param array $data
* @param string $name
*/
- public function testGenerateCalendarParameter(array $data, $name) {
+ public function testGenerateCalendarParameter(array $data, string $name) {
$l = $this->createMock(IL10N::class);
$l->expects($this->any())
->method('t')
@@ -165,7 +135,7 @@ class BaseTest extends TestCase {
* @param int $id
* @param string $name
*/
- public function testGenerateLegacyCalendarParameter($id, $name) {
+ public function testGenerateLegacyCalendarParameter(int $id, string $name) {
$this->assertEquals([
'type' => 'calendar',
'id' => $id,
@@ -184,7 +154,7 @@ class BaseTest extends TestCase {
* @dataProvider dataGenerateGroupParameter
* @param string $gid
*/
- public function testGenerateGroupParameter($gid) {
+ public function testGenerateGroupParameter(string $gid) {
$this->assertEquals([
'type' => 'user-group',
'id' => $gid,
@@ -209,7 +179,7 @@ class BaseTest extends TestCase {
* @param string $displayName
* @param IUser|null $user
*/
- public function testGenerateUserParameter($uid, $displayName, $user) {
+ public function testGenerateUserParameter(string $uid, string $displayName, ?IUser $user) {
$this->userManager->expects($this->once())
->method('get')
->with($uid)
diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
new file mode 100644
index 00000000000..2ae78444c11
--- /dev/null
+++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * @copyright Copyright (c) 2020 Thomas Citharel <nextcloud@tcit.fr>
+ *
+ * @author Thomas Citharel <nextcloud@tcit.fr>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\DAV\Tests\unit\CalDAV\Activity\Provider;
+
+use InvalidArgumentException;
+use OCA\DAV\CalDAV\Activity\Provider\Base;
+use OCA\DAV\CalDAV\Activity\Provider\Event;
+use OCP\Activity\IEventMerger;
+use OCP\Activity\IManager;
+use OCP\Activity\IProvider;
+use OCP\App\IAppManager;
+use OCP\IGroupManager;
+use OCP\IURLGenerator;
+use OCP\IUserManager;
+use OCP\L10N\IFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
+use TypeError;
+
+class EventTest extends TestCase {
+
+ /** @var IUserManager|MockObject */
+ protected $userManager;
+
+ /** @var IGroupManager|MockObject */
+ protected $groupManager;
+
+ /** @var IURLGenerator|MockObject */
+ protected $url;
+
+ /** @var IProvider|Base|MockObject */
+ protected $provider;
+
+ /** @var IAppManager|MockObject */
+ protected $appManager;
+
+ /** @var IFactory|MockObject */
+ protected $i10nFactory;
+
+ /** @var IManager|MockObject */
+ protected $activityManager;
+
+ /** @var IEventMerger|MockObject */
+ protected $eventMerger;
+
+ protected function setUp(): void {
+ parent::setUp();
+ $this->i10nFactory = $this->createMock(IFactory::class);
+ $this->userManager = $this->createMock(IUserManager::class);
+ $this->groupManager = $this->createMock(IGroupManager::class);
+ $this->activityManager = $this->createMock(IManager::class);
+ $this->url = $this->createMock(IURLGenerator::class);
+ $this->appManager = $this->createMock(IAppManager::class);
+ $this->eventMerger = $this->createMock(IEventMerger::class);
+ $this->provider = $this->getMockBuilder(Event::class)
+ ->setConstructorArgs([
+ $this->i10nFactory,
+ $this->url,
+ $this->activityManager,
+ $this->userManager,
+ $this->groupManager,
+ $this->eventMerger,
+ $this->appManager
+ ])
+ ->setMethods(['parse'])
+ ->getMock();
+ }
+
+ public function dataGenerateObjectParameter() {
+ $link = [
+ 'object_uri' => 'someuuid.ics',
+ 'calendar_uri' => 'personal',
+ 'owner' => 'someuser'
+ ];
+
+ return [
+ [23, 'c1', $link, true],
+ [23, 'c1', $link, false],
+ [42, 'c2', null],
+ ];
+ }
+
+ /**
+ * @dataProvider dataGenerateObjectParameter
+ * @param int $id
+ * @param string $name
+ * @param array|null $link
+ * @param bool $calendarAppEnabled
+ */
+ public function testGenerateObjectParameter(int $id, string $name, ?array $link, bool $calendarAppEnabled = true) {
+ if ($link) {
+ $generatedLink = [
+ 'view' => 'dayGridMonth',
+ 'timeRange' => 'now',
+ 'mode' => 'sidebar',
+ 'objectId' => base64_encode('/remote.php/dav/calendars/' . $link['owner'] . '/' . $link['calendar_uri'] . '/' . $link['object_uri']),
+ 'recurrenceId' => 'next'
+ ];
+ $this->appManager->expects($this->once())
+ ->method('isEnabledForUser')
+ ->with('calendar')
+ ->willReturn($calendarAppEnabled);
+ if ($calendarAppEnabled) {
+ $this->url->expects($this->once())
+ ->method('linkToRouteAbsolute')
+ ->with('calendar.view.indexview.timerange.edit', $generatedLink)
+ ->willReturn('fullLink');
+ }
+ }
+ $objectParameter = ['id' => $id, 'name' => $name];
+ if ($link) {
+ $objectParameter['link'] = $link;
+ }
+ $result = [
+ 'type' => 'calendar-event',
+ 'id' => $id,
+ 'name' => $name,
+ ];
+ if ($link && $calendarAppEnabled) {
+ $result['link'] = 'fullLink';
+ }
+ $this->assertEquals($result, $this->invokePrivate($this->provider, 'generateObjectParameter', [$objectParameter]));
+ }
+
+ public function dataGenerateObjectParameterThrows() {
+ return [
+ ['event', TypeError::class],
+ [['name' => 'event']],
+ [['id' => 42]],
+ ];
+ }
+
+ /**
+ * @dataProvider dataGenerateObjectParameterThrows
+ * @param mixed $eventData
+ * @param string $exception
+ */
+ public function testGenerateObjectParameterThrows($eventData, string $exception = InvalidArgumentException::class) {
+ $this->expectException($exception);
+
+ $this->invokePrivate($this->provider, 'generateObjectParameter', [$eventData]);
+ }
+}