From 7cf1dec84279a86f72631230813d1bf09dca4b3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Tue, 6 Dec 2022 13:52:13 +0100 Subject: [PATCH] Fix errors in calendar tests saying function handleIMipMessage does not exists on ICreateFromString MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- tests/lib/Calendar/ManagerTest.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php index ba30be1b548..540fd5c0c69 100644 --- a/tests/lib/Calendar/ManagerTest.php +++ b/tests/lib/Calendar/ManagerTest.php @@ -28,6 +28,7 @@ use OC\Calendar\Manager; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Calendar\ICalendar; use OCP\Calendar\ICreateFromString; +use OCP\Calendar\IHandleImipMessage; use PHPUnit\Framework\MockObject\MockObject; use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; @@ -35,6 +36,12 @@ use Sabre\VObject\Document; use Sabre\VObject\Reader; use Test\TestCase; +/* + * This allows us to create Mock object supporting both interfaces + */ +interface ICreateFromStringAndHandleImipMessage extends ICreateFromString, IHandleImipMessage { +} + class ManagerTest extends TestCase { /** @var Coordinator|MockObject */ @@ -334,7 +341,7 @@ class ManagerTest extends TestCase { 'getCalendarsForPrincipal' ]) ->getMock(); - $calendar = $this->createMock(ICreateFromString::class); + $calendar = $this->createMock(ICreateFromStringAndHandleImipMessage::class); $principalUri = 'principals/user/linus'; $sender = 'pierre@general-store.com'; $recipient = 'linus@stardew-tent-living.com'; @@ -371,7 +378,7 @@ class ManagerTest extends TestCase { 'getCalendarsForPrincipal' ]) ->getMock(); - $calendar = $this->createMock(ICreateFromString::class); + $calendar = $this->createMock(ICreateFromStringAndHandleImipMessage::class); $principalUri = 'principals/user/linus'; $sender = 'pierre@general-store.com'; $recipient = 'linus@stardew-tent-living.com'; @@ -495,7 +502,7 @@ class ManagerTest extends TestCase { $sender = 'clint@stardew-blacksmiths.com'; $recipient = 'pierre@general-store.com'; $replyTo = 'linus@stardew-tent-living.com'; - $calendar = $this->createMock(ICreateFromString::class); + $calendar = $this->createMock(ICreateFromStringAndHandleImipMessage::class); $calendarData = $this->getVCalendarCancel(); $this->time->expects(self::once()) @@ -532,7 +539,7 @@ class ManagerTest extends TestCase { $sender = 'linus@stardew-tent-living.com'; $recipient = 'pierre@general-store.com'; $replyTo = null; - $calendar = $this->createMock(ICreateFromString::class); + $calendar = $this->createMock(ICreateFromStringAndHandleImipMessage::class); $calendarData = $this->getVCalendarCancel(); $this->time->expects(self::once()) -- 2.39.5