Merge pull request #35620 from nextcloud/fix/fix-calendar-imip-tests

nextcloud · Dec 7, 2022 · 3c8fb59 · 3c8fb59
2 parents 744126a + 7cf1dec
commit 3c8fb59
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/tests/lib/Calendar/ManagerTest.php b/tests/lib/Calendar/ManagerTest.php
@@ -28,13 +28,20 @@
 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;
 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 @@ public function testHandleImipReplyEventNotFound(): void {
 				'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 @@ public function testHandleImipReply(): void {
 				'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 @@ public function testHandleImipCancelOrganiserInReplyTo(): void {
 		$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 @@ public function testHandleImipCancel(): void {
 		$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())